diff --git a/rpcs3/Input/basic_mouse_handler.cpp b/rpcs3/Input/basic_mouse_handler.cpp index 35a53bc2c0..a948c034c3 100644 --- a/rpcs3/Input/basic_mouse_handler.cpp +++ b/rpcs3/Input/basic_mouse_handler.cpp @@ -25,8 +25,6 @@ void basic_mouse_handler::Init(const u32 max_connect) input_log.notice("basic_mouse_handler: Could not load basic mouse config. Using defaults."); } - g_cfg_mouse.reload_requested = true; - reload_config(); m_mice.clear(); @@ -82,6 +80,12 @@ void basic_mouse_handler::SetTargetWindow(QWindow* target) bool basic_mouse_handler::eventFilter(QObject* target, QEvent* ev) { + if (m_info.max_connect == 0) + { + // Not initialized + return false; + } + if (!ev) { return false; diff --git a/rpcs3/Input/raw_mouse_handler.cpp b/rpcs3/Input/raw_mouse_handler.cpp index 0d622a29cd..90323f7625 100644 --- a/rpcs3/Input/raw_mouse_handler.cpp +++ b/rpcs3/Input/raw_mouse_handler.cpp @@ -267,8 +267,6 @@ void raw_mouse_handler::Init(const u32 max_connect) 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.resize(max_connect); @@ -559,6 +557,12 @@ std::map raw_mouse_handler::enumerate_devices(u32 max_connect) #ifdef _WIN32 void raw_mouse_handler::handle_native_event(const MSG& msg) { + if (m_info.max_connect == 0) + { + // Not initialized + return; + } + if (msg.message != WM_INPUT) { return;