piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Host_GetKeyState deadlock caused by Billiard's latest changes.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7304 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-03-05 21:58:54 +00:00
parent 9abf449e7c
commit 024a87af7a
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -665,7 +665,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
break;
case IDM_KEYSTATE:
bKeyStateResult = wxGetKeyState(wxKeyCode(event.GetInt()));
keystate_event.Set();
keystate_event.Wait();
break;
#endif

2
Source/Core/DolphinWX/Src/Frame.h
View File

@ -145,7 +145,7 @@ class CFrame : public CRenderFrame
#ifdef __WXGTK__
Common::Event panic_event;
bool bPanicResult;
Common::Event keystate_event;
Common::Barrier keystate_event;
bool bKeyStateResult;
#endif

2
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -1045,7 +1045,7 @@ void CFrame::DoStop()
#ifdef __WXGTK__
// Make sure the app doesn't hang waiting on a keystate check
keystate_event.Set();
keystate_event.Wait();
#endif
BootManager::Stop();