diff --git a/rpcs3/Input/raw_mouse_handler.cpp b/rpcs3/Input/raw_mouse_handler.cpp index 2ab72a1102..628877d9f6 100644 --- a/rpcs3/Input/raw_mouse_handler.cpp +++ b/rpcs3/Input/raw_mouse_handler.cpp @@ -213,12 +213,6 @@ void raw_mouse::update_values(const RAWMOUSE& state) } #endif -raw_mouse_handler::raw_mouse_handler(bool is_for_gui) - : MouseHandlerBase() - , m_is_for_gui(is_for_gui) -{ -} - raw_mouse_handler::~raw_mouse_handler() { if (m_thread) diff --git a/rpcs3/Input/raw_mouse_handler.h b/rpcs3/Input/raw_mouse_handler.h index fb58d7e93c..601d31dc7a 100644 --- a/rpcs3/Input/raw_mouse_handler.h +++ b/rpcs3/Input/raw_mouse_handler.h @@ -65,11 +65,17 @@ private: class raw_mouse_handler final : public MouseHandlerBase { public: - raw_mouse_handler(bool is_for_gui = false); + using MouseHandlerBase::MouseHandlerBase; + virtual ~raw_mouse_handler(); void Init(const u32 max_connect) override; + void SetIsForGui(bool value) + { + m_is_for_gui = value; + } + const std::map& get_mice() const { return m_raw_mice; }; void set_mouse_press_callback(std::function cb) diff --git a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp index b8533f6299..3cfccb9755 100644 --- a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp @@ -65,7 +65,8 @@ raw_mouse_settings_dialog::raw_mouse_settings_dialog(QWidget* parent) constexpr u32 max_devices = 16; - g_raw_mouse_handler = std::make_unique(true); + g_raw_mouse_handler = std::make_unique(); + g_raw_mouse_handler->SetIsForGui(true); g_raw_mouse_handler->Init(std::max(max_devices, ::size32(g_cfg_raw_mouse.players))); g_raw_mouse_handler->set_mouse_press_callback([this](const std::string& device_name, s32 cell_code, bool pressed) {