diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-03-06 04:31:43 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-03-06 04:31:43 +0000 |
| commit | ec7e160bdcf5b93aced2849473cbd9f22bdfe6a0 (patch) | |
| tree | 4912656b03642862ebd65e7c705105fa5e9c9a9e /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | 9095dad00900034649d7f3ec78bd5e5558e97fb7 (diff) | |
Fix Host_GetKeyState in a more effective way.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7308 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 408325ed23..7441fc4c62 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1021,6 +1021,11 @@ void CFrame::DoStop() { if (Core::GetState() != Core::CORE_UNINITIALIZED) { +#if defined __WXGTK__ + wxMutexGuiLeave(); + std::lock_guard<std::mutex> lk(keystate_lock); + wxMutexGuiEnter(); +#endif // Ask for confirmation in case the user accidentally clicked Stop / Escape if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop) { @@ -1043,11 +1048,6 @@ void CFrame::DoStop() if(Frame::IsPlayingInput() || Frame::IsRecordingInput()) Frame::EndPlayInput(false); -#ifdef __WXGTK__ - // Make sure the app doesn't hang waiting on a keystate check - keystate_event.Set(); -#endif - BootManager::Stop(); #if defined(HAVE_XDG_SCREENSAVER) && HAVE_XDG_SCREENSAVER |
