RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

Input: fix initial mouse config reload

Browse Source
This commit is contained in:
Megamouse 2024-08-08 05:35:23 +02:00
parent 548cc074f4
commit bc23615508
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpcs3/Emu/Io/mouse_config.cpp
View File

@ -19,9 +19,14 @@ bool mouse_config::exist() const
bool mouse_config::load() bool mouse_config::load()
{ {
g_cfg_mouse.from_default();
if (fs::file cfg_file{cfg_name, fs::read}) if (fs::file cfg_file{cfg_name, fs::read})
{ {
return from_string(cfg_file.to_string()); if (const std::string content = cfg_file.to_string(); !content.empty())
{
return from_string(content);
}
} }
return false; return false;

8
rpcs3/Input/basic_mouse_handler.cpp
View File

@ -20,8 +20,12 @@ void basic_mouse_handler::Init(const u32 max_connect)
return; return;
} }
g_cfg_mouse.from_default(); if (!g_cfg_mouse.load())
g_cfg_mouse.load(); {
input_log.notice("basic_mouse_handler: Could not load basic mouse config. Using defaults.");
}
g_cfg_mouse.reload_requested = true;
reload_config(); reload_config();

2
rpcs3/Input/raw_mouse_handler.cpp
View File

@ -267,6 +267,8 @@ void raw_mouse_handler::Init(const u32 max_connect)
input_log.notice("raw_mouse_handler: Could not load raw mouse config. Using defaults."); input_log.notice("raw_mouse_handler: Could not load raw mouse config. Using defaults.");
} }
g_cfg_raw_mouse.reload_requested = true;
m_mice.clear(); m_mice.clear();
m_mice.resize(max_connect); m_mice.resize(max_connect);