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

Minor changes related to Emu.Stop()

Browse source
This commit is contained in:
Megamouse 2020-11-24 19:13:42 +01:00
parent d8e9382573
commit 9efedbe76a
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/System.cpp
View file

@ -1957,9 +1957,12 @@ 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 (!m_force_boot && Quit(g_cfg.misc.autoexit.get())) if (!m_force_boot)
{ {
return; if (Quit(g_cfg.misc.autoexit.get()))
{
return;
}
} }
m_force_boot = false; m_force_boot = false;

5
rpcs3/Emu/System.h
View file

@ -83,7 +83,12 @@ class Emulator final
u32 m_usrid{1}; u32 m_usrid{1};
bool m_force_global_config = false; bool m_force_global_config = false;
// This flag should be adjusted before each Stop() or each BootGame() and similar because:
// 1. It forces an application to boot immediately by calling Run() in Load().
// 2. It signifies that we don't want to exit on Stop(), for example if we want to transition to another application.
bool m_force_boot = false; bool m_force_boot = false;
bool m_has_gui = true; bool m_has_gui = true;
public: public:

5
rpcs3/rpcs3qt/main_window.cpp
View file

@ -2227,7 +2227,10 @@ void main_window::closeEvent(QCloseEvent* closeEvent)
} }
// Cleanly stop and quit the emulator. // Cleanly stop and quit the emulator.
Emu.Stop(); if (!Emu.IsStopped())
{
Emu.Stop();
}
Emu.Quit(true); Emu.Quit(true);
} }