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:
parent
f2f9df90e1
commit
4223ebc8d2
|
@ -351,6 +351,7 @@ CFrame::CFrame(wxFrame* parent,
|
|||
#ifdef __WXGTK__
|
||||
panic_event.Init();
|
||||
keystate_event.Init();
|
||||
bKeyStateResult = false;
|
||||
#endif
|
||||
|
||||
if (ShowLogWindow) SConfig::GetInstance().m_InterfaceLogWindow = true;
|
||||
|
|
|
@ -978,6 +978,11 @@ void CFrame::DoStop()
|
|||
if(Frame::IsPlayingInput() || Frame::IsRecordingInput())
|
||||
Frame::EndPlayInput();
|
||||
|
||||
#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
|
||||
|
|
Loading…
Reference in New Issue