From 8d491d3faa8363df31ab2b3cc31f62e575f61db1 Mon Sep 17 00:00:00 2001 From: Silent Date: Sat, 23 Dec 2023 15:27:10 +0100 Subject: [PATCH] System: Mark the VM as Stopping in ShutdownSystem unconditionally Fixes an issue where Discord RPC didn't revert to "No Game Running" on shutdown. --- src/core/system.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index 40ad38257..773580a1b 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -4138,9 +4138,8 @@ void System::ShutdownSystem(bool save_resume_state) if (save_resume_state) SaveResumeState(); - if (s_system_executing) - s_state = State::Stopping; - else + s_state = State::Stopping; + if (!s_system_executing) DestroySystem(); }