From fa009ab6f6bed28d3415df7d1dfc264a3996a0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Tue, 4 Oct 2016 22:54:55 +0200 Subject: [PATCH] DolphinWX: Exit after closing main window or on signal Previously Dolphin would only exit if the main window is closed, and Confirm on Stop is enabled. This makes Dolphin's behaviour more consistent by always exiting if the main window is closed or on shutdown signal. --- Source/Core/DolphinWX/Frame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 2253297bb6..1e31ee48cb 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -615,8 +615,7 @@ void CFrame::OnClose(wxCloseEvent& event) event.Veto(); } // Tell OnStopped to resubmit the Close event - if (m_confirmStop) - m_bClosing = true; + m_bClosing = true; return; } @@ -1716,6 +1715,7 @@ void CFrame::HandleSignal(wxTimerEvent& event) { if (!s_shutdown_signal_received.TestAndClear()) return; + m_bClosing = true; Close(); }