From 546181c4571ddf995fa5cad13596a254f1330491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 27 May 2017 18:57:07 +0200 Subject: [PATCH] WX: Clear m_is_game_loading at the proper moment This should happen after the core has stopped (OnStopped), not when the user wants to stop (DoStop). --- Source/Core/DolphinWX/FrameTools.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 0ba143172f..b8e4e5fbf9 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -818,7 +818,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__ @@ -919,6 +918,7 @@ bool CFrame::TriggerSTMPowerEvent() void CFrame::OnStopped() { m_confirm_stop = false; + m_is_game_loading = false; m_tried_graceful_shutdown = false; UninhibitScreensaver();