mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-10-07 15:53:34 +00:00
Merge pull request #3788 from EmptyChaos/close-reclose-bug
CFrame: Fix Confirm Close
This commit is contained in:
commit
aebff2c161
@ -576,8 +576,6 @@ void CFrame::OnActive(wxActivateEvent& event)
|
|||||||
|
|
||||||
void CFrame::OnClose(wxCloseEvent& event)
|
void CFrame::OnClose(wxCloseEvent& event)
|
||||||
{
|
{
|
||||||
m_bClosing = true;
|
|
||||||
|
|
||||||
// Before closing the window we need to shut down the emulation core.
|
// Before closing the window we need to shut down the emulation core.
|
||||||
// We'll try to close this window again once that is done.
|
// We'll try to close this window again once that is done.
|
||||||
if (Core::GetState() != Core::CORE_UNINITIALIZED)
|
if (Core::GetState() != Core::CORE_UNINITIALIZED)
|
||||||
@ -587,6 +585,9 @@ void CFrame::OnClose(wxCloseEvent& event)
|
|||||||
{
|
{
|
||||||
event.Veto();
|
event.Veto();
|
||||||
}
|
}
|
||||||
|
// Tell OnStopped to resubmit the Close event
|
||||||
|
if (m_confirmStop)
|
||||||
|
m_bClosing = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user