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:
parent
183f3c3759
commit
fa009ab6f6
|
@ -615,8 +615,7 @@ void CFrame::OnClose(wxCloseEvent& event)
|
||||||
event.Veto();
|
event.Veto();
|
||||||
}
|
}
|
||||||
// Tell OnStopped to resubmit the Close event
|
// Tell OnStopped to resubmit the Close event
|
||||||
if (m_confirmStop)
|
m_bClosing = true;
|
||||||
m_bClosing = true;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1716,6 +1715,7 @@ void CFrame::HandleSignal(wxTimerEvent& event)
|
||||||
{
|
{
|
||||||
if (!s_shutdown_signal_received.TestAndClear())
|
if (!s_shutdown_signal_received.TestAndClear())
|
||||||
return;
|
return;
|
||||||
|
m_bClosing = true;
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue