Merge pull request #3788 from EmptyChaos/close-reclose-bug

CFrame: Fix Confirm Close
This commit is contained in:
Pierre Bourdon 2016-04-19 14:31:47 +02:00
commit aebff2c161

View File

@ -576,8 +576,6 @@ void CFrame::OnActive(wxActivateEvent& event)
void CFrame::OnClose(wxCloseEvent& event)
{
m_bClosing = true;
// 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)
@ -587,6 +585,9 @@ void CFrame::OnClose(wxCloseEvent& event)
{
event.Veto();
}
// Tell OnStopped to resubmit the Close event
if (m_confirmStop)
m_bClosing = true;
return;
}