CFrame: Fix Confirm Close
Closing Dolphin's main frame and clicking "no" does not clear m_bClosing which means that pressing the "stop" button triggers OnClosed which suddenly and unexpectedly closes the main frame.
This commit is contained in:
parent
5e4554df42
commit
49babfb60b
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue