Merge pull request #7741 from Techjar/no-resume-on-stop

Qt/MainWindow: Don't unpause after confirming shutdown
2019-01-26 23:48:52 +10:00 · 2019-01-26 23:48:52 +10:00 · ff5e296576
parent cf6eb3d38d 408029e8a3
commit ff5e296576
1 changed files with 5 additions and 3 deletions
--- a/Source/Core/DolphinQt/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@ -766,11 +766,13 @@ bool MainWindow::RequestStop()
                                           "before it completes. Force stop?") :
                                        tr("Do you want to stop the current emulation?"));

-    if (pause)
-      Core::SetState(state);
-
    if (confirm != QMessageBox::Yes)
+    {
+      if (pause)
+        Core::SetState(state);
+
      return false;
+    }
  }

  // TODO: Add Movie shutdown