From 0092f5207ba873e54d4793b19bd4c4c13b21d24c Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 22 Jul 2015 09:44:39 +0200 Subject: [PATCH] Core: Don't return true on IsRunning() when stopping emulation. --- Source/Core/Core/Core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index c37a5df922..ade5554b6c 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -163,7 +163,7 @@ void DisplayMessage(const std::string& message, int time_in_ms) bool IsRunning() { - return (GetState() != CORE_UNINITIALIZED) || s_hardware_initialized; + return (GetState() != CORE_UNINITIALIZED || s_hardware_initialized) && !s_is_stopping; } bool IsRunningAndStarted()