diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2019-01-26 23:48:52 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 23:48:52 +1000 |
| commit | ff5e29657655b0a423b94575f5766e6a56fc3407 (patch) | |
| tree | 013d9930bfcd68d85adebe8380db9f29e008cace /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | cf6eb3d38d04a027ce925e2ae2a69bb5338c9c06 (diff) | |
| parent | 408029e8a310e142d798ee58af0a08abc06b5034 (diff) | |
Merge pull request #7741 from Techjar/no-resume-on-stop
Qt/MainWindow: Don't unpause after confirming shutdown
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 9caf98d966..8389940c06 100644 --- 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 |