izzy/WeeU
0
0
Fork 0
mirror of https://github.com/izzy2lost/WeeU.git synced 2026-07-06 00:19:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into android

Browse Source
This commit is contained in:
SSimco
2024-07-09 11:23:13 +03:00
parent 7e4a0a5264 9d366937cd
commit aae6313fdb
264 changed files with 13087 additions and 6079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input/InputManager.cpp
+4 -7
View File
@@ -487,15 +487,12 @@ bool InputManager::save(size_t player_index, std::string_view filename)
emulated_controller->type_string()
}.c_str());
if(!is_default_file)
emulated_controller->m_profile_name = std::string{filename};
if (emulated_controller->has_profile_name())
emulated_controller_node.append_child("profile").append_child(pugi::node_pcdata).set_value(
emulated_controller->get_profile_name().c_str());
else if (!is_default_file)
{
emulated_controller->m_profile_name = std::string{filename};
emulated_controller_node.append_child("profile").append_child(pugi::node_pcdata).set_value(
emulated_controller->get_profile_name().c_str());
}
// custom settings
emulated_controller->save(emulated_controller_node);
@@ -949,7 +946,7 @@ std::optional<glm::ivec2> InputManager::get_right_down_mouse_info(bool* is_pad)
void InputManager::update_thread()
{
SetThreadName("InputManager::update_thread");
SetThreadName("Input_update");
while (!m_update_thread_shutdown.load(std::memory_order::relaxed))
{
std::shared_lock lock(m_mutex);