summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2016-10-04 22:57:04 +0200
committerLéo Lam <leo@innovatetechnologi.es>2016-10-15 21:58:55 +0200
commit48ff76d495949219474254b62388f1b83ddbf5c1 (patch)
tree5d26071f5dd51828c726c788ca3c73a6f3321d3f /Source/Core/DolphinWX/FrameTools.cpp
parentfa009ab6f6bed28d3415df7d1dfc264a3996a0ad (diff)
DolphinWX: Update GUI properly after unpausing
If an unpause was forced by the graceful shutdown code, the UI was previously not updated.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp4
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;