ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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).
This commit is contained in:
Léo Lam 2017-05-27 18:57:07 +02:00
parent 52f00603e2
commit 546181c457
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/FrameTools.cpp
View File

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