mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-03-16 16:21:02 +00:00
Fix auto exit
- 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:
parent
8228a4adcd
commit
5076da8f77
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -285,7 +285,11 @@ bool gs_frame::get_mouse_lock_state()
|
|||||||
|
|
||||||
void gs_frame::close()
|
void gs_frame::close()
|
||||||
{
|
{
|
||||||
Emu.Stop();
|
if (!Emu.IsStopped())
|
||||||
|
{
|
||||||
|
Emu.Stop();
|
||||||
|
}
|
||||||
|
|
||||||
Emu.CallAfter([this]() { deleteLater(); });
|
Emu.CallAfter([this]() { deleteLater(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user