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

Frame: OnClose now handles asynchronous behaviour of DoStop().

Browse Source
This commit is contained in:
Jules Blok
2014-06-20 03:03:00 +02:00
parent 3266394dfb
commit b30d5dccbe
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -832,9 +832,16 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))
void CFrame::OnRenderParentClose(wxCloseEvent& event)
{
DoStop();
if (Core::GetState() == Core::CORE_UNINITIALIZED)
event.Skip();
// Before closing the window we need to shut down the emulation core.
// We'll try to close this window again once that is done.
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
DoStop();
event.Veto();
return;
}
event.Skip();
}
void CFrame::OnRenderParentMove(wxMoveEvent& event)
@ -1177,8 +1184,8 @@ void CFrame::OnStopped()
// Clear wiimote connection status from the status bar.
GetStatusBar()->SetStatusText(" ", 1);
// If batch mode was specified on the command-line, exit now.
if (m_bBatchMode)
// If batch mode was specified on the command-line or we were already closing, exit now.
if (m_bBatchMode || m_bClosing)
Close(true);
// If using auto size with render to main, reset the application size.