ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a hang on emulation shutdown on linux. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7036 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-02-01 20:21:24 +00:00
parent f2f9df90e1
commit 4223ebc8d2
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,6 +351,7 @@ CFrame::CFrame(wxFrame* parent,
#ifdef __WXGTK__ #ifdef __WXGTK__
panic_event.Init(); panic_event.Init();
keystate_event.Init(); keystate_event.Init();
bKeyStateResult = false;
#endif #endif
if (ShowLogWindow) SConfig::GetInstance().m_InterfaceLogWindow = true; if (ShowLogWindow) SConfig::GetInstance().m_InterfaceLogWindow = true;

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

@ -978,6 +978,11 @@ void CFrame::DoStop()
if(Frame::IsPlayingInput() || Frame::IsRecordingInput()) if(Frame::IsPlayingInput() || Frame::IsRecordingInput())
Frame::EndPlayInput(); Frame::EndPlayInput();
#ifdef __WXGTK__
// Make sure the app doesn't hang waiting on a keystate check
keystate_event.Set();
#endif
BootManager::Stop(); BootManager::Stop();
#if defined(HAVE_XDG_SCREENSAVER) && HAVE_XDG_SCREENSAVER #if defined(HAVE_XDG_SCREENSAVER) && HAVE_XDG_SCREENSAVER