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

Qt/MainWindow: Don't unpause after confirming shutdown
dolphin-emu · Jan 26, 2019 · ff5e296 · ff5e296
2 parents cf6eb3d + 408029e
commit ff5e296
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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