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

Merge pull request #4302 from leoetlino/graceful-fixes

Browse Source 
Minor fixes to graceful shutdown
This commit is contained in:
shuffle2
2016-10-15 21:47:07 -07:00
committed by GitHub
parent d2d4edf964 a0a246bf3e
commit ce5c8c28b2
5 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Frame.cpp
View File

@ -615,8 +615,7 @@ void CFrame::OnClose(wxCloseEvent& event)
event.Veto();
}
// Tell OnStopped to resubmit the Close event
if (m_confirmStop)
m_bClosing = true;
m_bClosing = true;
return;
}
@ -1714,5 +1713,6 @@ void CFrame::HandleSignal(wxTimerEvent& event)
{
if (!s_shutdown_signal_received.TestAndClear())
return;
m_bClosing = true;
Close();
}