diff options
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index ef08e6b721..7da392e2b4 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1344,7 +1344,9 @@ void CFrame::DoStop() if (SConfig::GetInstance().bWii && !m_tried_graceful_shutdown) { Core::DisplayMessage("Shutting down", 30000); - Core::SetState(Core::CORE_RUN); + // Unpause because gracefully shutting down needs the game to actually request a shutdown + if (Core::GetState() == Core::CORE_PAUSE) + DoPause(); ProcessorInterface::PowerButton_Tap(); m_confirmStop = false; m_tried_graceful_shutdown = true; |