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.
This commit is contained in:
Léo Lam 2016-10-04 22:54:55 +02:00
parent 183f3c3759
commit fa009ab6f6
1 changed files with 2 additions and 2 deletions

View File

@ -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();
}