From f371f8be3e3c08e9bdbc6aa148487eb9e620240e Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 6 Jul 2025 11:56:40 +0200 Subject: [PATCH] Move gamemode exit to final kill callback analog to display_sleep --- rpcs3/Emu/System.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 2e8561ad9a..233a6bb0ff 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -3242,12 +3242,6 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s 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; // 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. 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) { Quit(g_cfg.misc.autoexit.get());