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

CFrame: Fix Confirm Close

1 files changed, 3 insertions, 2 deletions

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 1707cf4a51..9a6c70712d 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -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;
 	}