summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2015-07-16 02:00:56 +0200
committerAdmiral H. Curtiss <pikachu025@gmail.com>2015-07-16 02:35:57 +0200
commit935292c6fcc99d6a10126cfb4b2acaa2d29974e5 (patch)
tree49959cd9a2077e50d08b25f36b3772379895a4cf /Source/Core/DolphinWX/Frame.cpp
parent5594b107eb4e43ab4f0c3466bf531cb0a3112f2b (diff)
DolphinWX: In Host_ConnectWiimote(), instead of calling CFrame::ConnectWiimote() directly, dispatch an event that will call it for us in the GUI thread.
This eliminates a possible stutter/short freeze that can happen during PowerPC::Pause().
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 759c2bdc6e..e58a8c4ce1 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -776,6 +776,22 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
case IDM_STOPPED:
OnStopped();
break;
+
+ case IDM_FORCE_CONNECT_WIIMOTE1:
+ case IDM_FORCE_CONNECT_WIIMOTE2:
+ case IDM_FORCE_CONNECT_WIIMOTE3:
+ case IDM_FORCE_CONNECT_WIIMOTE4:
+ case IDM_FORCE_CONNECT_BALANCEBOARD:
+ ConnectWiimote(event.GetId() - IDM_FORCE_CONNECT_WIIMOTE1, true);
+ break;
+
+ case IDM_FORCE_DISCONNECT_WIIMOTE1:
+ case IDM_FORCE_DISCONNECT_WIIMOTE2:
+ case IDM_FORCE_DISCONNECT_WIIMOTE3:
+ case IDM_FORCE_DISCONNECT_WIIMOTE4:
+ case IDM_FORCE_DISCONNECT_BALANCEBOARD:
+ ConnectWiimote(event.GetId() - IDM_FORCE_DISCONNECT_WIIMOTE1, false);
+ break;
}
}