ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5709 from spycrab/qt_sd_pausefix 

Qt: Fix emulation not returning to its original state when aborting s…
This commit is contained in:
Jules Blok 2017-06-27 18:15:11 +02:00 committed by GitHub
parent 94ba78d717 feb67a3953
commit 43dba0cb47
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -301,11 +301,11 @@ bool MainWindow::Stop()
"may be lost if you stop the current emulation " "may be lost if you stop the current emulation "
"before it completes. Force stop?") : "before it completes. Force stop?") :
tr("Do you want to stop the current emulation?")); tr("Do you want to stop the current emulation?"));
if (confirm != QMessageBox::Yes)
return false;
if (pause) if (pause)
Core::SetState(state); Core::SetState(state);
if (confirm != QMessageBox::Yes)
return false;
} }
// TODO: Add Movie shutdown // TODO: Add Movie shutdown