From 680aaf21f0447b9cd5ca3c52fecda2aaf103cace Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 25 Sep 2018 21:12:17 +0300 Subject: [PATCH] Fix consistency in Emu::Stop() Don't clear force_boot on shortcut Load() --- rpcs3/Emu/System.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index cbb4c11eca..9328386677 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -1351,12 +1351,13 @@ void Emulator::Stop(bool restart) { if (m_state.exchange(system_state::stopped) == system_state::stopped) { - m_force_boot = false; - if (restart) { return Load(); } + + m_force_boot = false; + return; } const bool do_exit = !restart && !m_force_boot && g_cfg.misc.autoexit;