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

Qt: Fix improper shutdown with CTRL+C

This commit is contained in:
Stenzek 2023-04-02 19:26:25 +10:00 committed by refractionpcsx2
parent 6362994fd8
commit daef69099b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2-qt/MainWindow.cpp
View File

@ -1430,13 +1430,16 @@ bool MainWindow::requestShutdown(bool allow_confirm, bool allow_save_to_state, b
void MainWindow::requestExit(bool allow_confirm) void MainWindow::requestExit(bool allow_confirm)
{ {
// requestShutdown() clears this flag.
const bool vm_was_valid = QtHost::IsVMValid();
// this is block, because otherwise closeEvent() will also prompt // this is block, because otherwise closeEvent() will also prompt
if (!requestShutdown(allow_confirm, true, EmuConfig.SaveStateOnShutdown)) if (!requestShutdown(allow_confirm, true, EmuConfig.SaveStateOnShutdown))
return; return;
// VM stopped signal won't have fired yet, so queue an exit if we still have one. // VM stopped signal won't have fired yet, so queue an exit if we still have one.
// Otherwise, immediately exit, because there's no VM to exit us later. // Otherwise, immediately exit, because there's no VM to exit us later.
if (QtHost::IsVMValid()) if (vm_was_valid)
m_is_closing = true; m_is_closing = true;
else else
QGuiApplication::quit(); QGuiApplication::quit();