From e2b74f635410891b4ab9c202ecdd83dfe05df239 Mon Sep 17 00:00:00 2001
From: Hedges <hedges@resync.pl>
Date: Tue, 7 Aug 2018 03:01:24 +0100
Subject: GDBStub works with both Unicorn and Dynarmic now (#941)

* GDBStub works with both Unicorn and Dynarmic now

* Tidy up
---
 src/core/core.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/core/core.cpp')

diff --git a/src/core/core.cpp b/src/core/core.cpp
index e01c45cdd..085ba68d0 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -62,7 +62,6 @@ System::ResultStatus System::RunLoop(bool tight_loop) {
         // execute. Otherwise, get out of the loop function.
         if (GDBStub::GetCpuHaltFlag()) {
             if (GDBStub::GetCpuStepFlag()) {
-                GDBStub::SetCpuStepFlag(false);
                 tight_loop = false;
             } else {
                 return ResultStatus::Success;
@@ -78,6 +77,10 @@ System::ResultStatus System::RunLoop(bool tight_loop) {
         }
     }
 
+    if (GDBStub::IsServerEnabled()) {
+        GDBStub::SetCpuStepFlag(false);
+    }
+
     return status;
 }
 
-- 
cgit v1.2.3