archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix auto exit

Browse source 
- Don't quit on stop if force boot was set
- Don't stop the emulator on gs_frame close when it was already stopped. This would remove the force boot flag by mistake.
This commit is contained in:
Megamouse 2020-08-28 23:00:37 +02:00 • committed by Ivan
parent 8228a4adcd
commit 5076da8f77
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/System.cpp
View file

@ -1957,7 +1957,7 @@ void Emulator::Stop(bool restart)
// Always Enable display sleep, not only if it was prevented. // Always Enable display sleep, not only if it was prevented.
enable_display_sleep(); enable_display_sleep();
if (Quit(g_cfg.misc.autoexit.get())) if (!m_force_boot && Quit(g_cfg.misc.autoexit.get()))
{ {
return; return;
} }

4
rpcs3/rpcs3qt/gs_frame.cpp
View file

@ -284,8 +284,12 @@ bool gs_frame::get_mouse_lock_state()
} }
void gs_frame::close() void gs_frame::close()
{
if (!Emu.IsStopped())
{ {
Emu.Stop(); Emu.Stop();
}
Emu.CallAfter([this]() { deleteLater(); }); Emu.CallAfter([this]() { deleteLater(); });
} }