Merge pull request #5517 from leoetlino/more-reliable-shutdown

More reliable shutdown
This commit is contained in:
Leo Lam
2017-06-03 21:33:43 +02:00
committed by GitHub
2 changed files with 37 additions and 34 deletions

View File

@ -810,7 +810,6 @@ void CFrame::DoStop()
// don't let this function run again until it finishes, or is aborted.
m_confirm_stop = true;
m_is_game_loading = false;
if (Core::GetState() != Core::State::Uninitialized || m_render_parent != nullptr)
{
#if defined __WXGTK__
@ -911,6 +910,7 @@ bool CFrame::TriggerSTMPowerEvent()
void CFrame::OnStopped()
{
m_confirm_stop = false;
m_is_game_loading = false;
m_tried_graceful_shutdown = false;
UninhibitScreensaver();