From d8212fd927fea1166606d7b12811030487db8704 Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Wed, 4 Jul 2018 00:52:53 +0200
Subject: [PATCH] Core/Core: Fix getting stuck when Stop is called without
 emulation running

---
 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 f54e477be3..f5bd36ab9b 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -237,7 +237,7 @@ static void ResetRumble()
 // Called from GUI thread
 void Stop()  // - Hammertime!
 {
-  if (GetState() == State::Stopping)
+  if (GetState() == State::Stopping || GetState() == State::Uninitialized)
     return;
 
   const SConfig& _CoreParameter = SConfig::GetInstance();