mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-12 02:59:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gui_application: fix handling of hotplug events

Browse source
This commit is contained in:
Sanjay Govind 2025-01-24 09:18:12 +13:00
commit 63527ec806
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/rpcs3qt/gui_application.cpp
View file

@ -1201,26 +1201,31 @@ void gui_application::OnAppStateChanged(Qt::ApplicationState state)
bool gui_application::native_event_filter::nativeEventFilter([[maybe_unused]] const QByteArray& eventType, [[maybe_unused]] void* message, [[maybe_unused]] qintptr* result) bool gui_application::native_event_filter::nativeEventFilter([[maybe_unused]] const QByteArray& eventType, [[maybe_unused]] void* message, [[maybe_unused]] qintptr* result)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (!Emu.IsRunning() && !Emu.IsStarting()) if (!Emu.IsRunning() && !Emu.IsStarting() && !g_raw_mouse_handler)
{ {
return false; return false;
} }
if (eventType == "windows_generic_MSG") if (eventType == "windows_generic_MSG")
{ {
if (MSG* msg = static_cast<MSG*>(message); msg) if (MSG* msg = static_cast<MSG*>(message); msg && (msg->message == WM_INPUT || msg->message == WM_KEYDOWN || msg->message == WM_KEYUP || msg->message == WM_DEVICECHANGE))
{ {
if (g_raw_mouse_handler && (msg->message == WM_INPUT || msg->message == WM_KEYDOWN || msg->message == WM_KEYUP)) { if (msg->message == WM_DEVICECHANGE)
{
if (Emu.IsRunning() || Emu.IsStarting())
{
handle_hotplug_event(msg->wParam == DBT_DEVICEARRIVAL);
}
return false;
}
if (auto* handler = g_fxo->try_get<MouseHandlerBase>(); handler && handler->type == mouse_handler::raw) if (auto* handler = g_fxo->try_get<MouseHandlerBase>(); handler && handler->type == mouse_handler::raw)
{ {
static_cast<raw_mouse_handler*>(handler)->handle_native_event(*msg); static_cast<raw_mouse_handler*>(handler)->handle_native_event(*msg);
} }
g_raw_mouse_handler->handle_native_event(*msg);
} if (g_raw_mouse_handler)
if (msg->message == WM_DEVICECHANGE)
{ {
handle_hotplug_event(msg->wParam == DBT_DEVICEARRIVAL); g_raw_mouse_handler->handle_native_event(*msg);
return false;
} }
} }
} }