summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2017-06-27 18:06:27 +0200
committerspycrab <spycrab@users.noreply.github.com>2017-06-27 18:06:27 +0200
commitfeb67a3953bddd6ed14e013d28b4e9542b0ea545 (patch)
tree45f369a26468c8a1e6388031fa8ad1b16f882856 /Source/Core
parent94ba78d71701bab19362d49bc2700912bc5c7991 (diff)
Qt: Fix emulation not returning to its original state when aborting shutdown
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt2/MainWindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
index 92a7ec0020..2e89eb5679 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -301,11 +301,11 @@ bool MainWindow::Stop()
"may be lost if you stop the current emulation "
"before it completes. Force stop?") :
tr("Do you want to stop the current emulation?"));
- if (confirm != QMessageBox::Yes)
- return false;
-
if (pause)
Core::SetState(state);
+
+ if (confirm != QMessageBox::Yes)
+ return false;
}
// TODO: Add Movie shutdown