Merge pull request #4198 from aldelaro5/memory-breakpoint-fix

Fix the memChecks breaking a second time after hitting one and unpausing
dolphin-emu · Sep 12, 2016 · 65c1df3 · 65c1df3
2 parents 609d147 + f689b1e
commit 65c1df3
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
@@ -90,10 +90,12 @@ void Run()
       {
         if (PowerPC::breakpoints.IsAddressBreakPoint(PC) || PowerPC::memchecks.HasAny())
         {
+          s_state = CPU_STEPPING;
           PowerPC::CoreMode old_mode = PowerPC::GetMode();
           PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
           PowerPC::SingleStep();
           PowerPC::SetMode(old_mode);
+          s_state = CPU_RUNNING;
         }
       }