From 1adec3d8e58da3ab2525ea8ad737b59e4a125d2a Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Fri, 18 Dec 2020 13:37:14 +0300 Subject: [PATCH] Hotfix: Emu.Quit after Emu.Stop --- rpcs3/Emu/System.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 029579b2a3..b571a16a26 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -1980,7 +1980,10 @@ bool Emulator::Quit(bool force_quit) m_force_boot = false; // Deinitialize object manager to prevent any hanging objects at program exit - *g_fxo = {}; + if (force_quit) + { + *g_fxo = {}; + } return GetCallbacks().exit(force_quit); }