diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-06-03 21:33:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 21:33:43 +0200 |
| commit | 227bc3816f589f4df1d41910d7162f75bca63e45 (patch) | |
| tree | 01ba4ff7ff1aabea1e661a96bdc35bccf9081322 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | bcc85f9f4dd3e59a8e27f01ec8a3d2514d53ae94 (diff) | |
| parent | 546181c4571ddf995fa5cad13596a254f1330491 (diff) | |
Merge pull request #5517 from leoetlino/more-reliable-shutdown
More reliable shutdown
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 7f538563b5..b59720ad71 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -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(); |