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

Fix the memChecks breaking a second time after hitting one and unpausing
2016-09-12 14:51:47 +12:00 · 2016-09-12 14:51:47 +12:00 · 65c1df34f4
parent 609d147dca f689b1e6b5
commit 65c1df34f4
1 changed files with 2 additions and 0 deletions
--- 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;
        }
      }