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

Move gamemode exit to final kill callback analog to display_sleep

Browse source
This commit is contained in:
Megamouse 2025-07-06 11:56:40 +02:00
parent a965607f14
commit f371f8be3e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/System.cpp
View file

@ -3242,12 +3242,6 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
sys_log.notice("Stopping emulator..."); sys_log.notice("Stopping emulator...");
// Calling Gamemode Exit on Stop
if (g_cfg.misc.enable_gamemode)
{
Emu.GetCallbacks().enable_gamemode(false);
}
const bool continuous_savestate_mode = savestate && !g_cfg.savestate.suspend_emu; const bool continuous_savestate_mode = savestate && !g_cfg.savestate.suspend_emu;
// Show visual feedback to the user in case that stopping takes a while. // Show visual feedback to the user in case that stopping takes a while.
@ -3833,6 +3827,12 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
// Always Enable display sleep, not only if it was prevented. // Always Enable display sleep, not only if it was prevented.
Emu.GetCallbacks().enable_display_sleep(true); Emu.GetCallbacks().enable_display_sleep(true);
// Calling Gamemode Exit on Stop
if (g_cfg.misc.enable_gamemode)
{
Emu.GetCallbacks().enable_gamemode(false);
}
if (allow_autoexit) if (allow_autoexit)
{ {
Quit(g_cfg.misc.autoexit.get()); Quit(g_cfg.misc.autoexit.get());