RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Emu: always use Emu.Quit() to quit RPCS3

Browse source 
This creates a single possible point of failure for calling quit()
This commit is contained in:
Megamouse 2020-07-03 17:11:28 +02:00
parent 332f9cae77
commit d91551c277
5 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/rpcs3qt/main_window.cpp
View file

@ -72,6 +72,7 @@ main_window::main_window(std::shared_ptr<gui_settings> gui_settings, std::shared
main_window::~main_window()
{
SaveWindowState();
delete ui;
}
@ -2140,7 +2141,7 @@ void main_window::mouseDoubleClickEvent(QMouseEvent *event)
}
}
/** Override the Qt close event to have the emulator stop and the application die. May add a warning dialog in future.
/** Override the Qt close event to have the emulator stop and the application die.
*/
void main_window::closeEvent(QCloseEvent* closeEvent)
{
@ -2150,13 +2151,8 @@ void main_window::closeEvent(QCloseEvent* closeEvent)
return;
}
// Cleanly stop the emulator.
Emu.Stop();
SaveWindowState();
// It's possible to have other windows open, like games. So, force the application to die.
QApplication::quit();
// Cleanly stop and quit the emulator.
Emu.Quit(true);
}
/**