dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-05-12 16:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix restart-loops upon restart-then-quit

Browse Source 
(std::exchange one-liner courtesy of Elad <18193363+elad335@users.noreply.github.com>)
This commit is contained in:
schm1dtmac 2026-05-11 17:00:14 +01:00
parent 6fa7efbcc3
commit 9256a0277f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpcs3/Emu/System.cpp
View File

@ -4068,8 +4068,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
if (after_kill_callback)
{
// Make after_kill_callback empty before call
const auto callback = std::move(after_kill_callback);
callback();
std::exchange(after_kill_callback, nullptr)();
}
});
}));
@ -4125,7 +4124,7 @@ game_boot_result Emulator::Restart(bool graceful, bool reset_path)
else
{
// Execute and empty the callback
::as_rvalue(std::move(Emu.after_kill_callback))();
std::exchange(Emu.after_kill_callback, nullptr)();
}
return game_boot_result::no_errors;