From e1c464e309e28db2a7579e3184b0a7da0be06c35 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Fri, 2 Mar 2018 18:23:47 +1100
Subject: [PATCH] [Debugger] If stepping ops already, ignore finding a memory
 BreakPoint

---
 .../Project64-core/N64System/Interpreter/InterpreterOps.cpp   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp
index f149ccb15..d1647e0f6 100644
--- a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp
+++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp
@@ -3018,6 +3018,10 @@ void R4300iOp::UnknownOpcode()
 
 bool R4300iOp::MemoryBreakpoint()
 {
+    if (g_Settings->LoadBool(Debugger_SteppingOps))
+    {
+        return false;
+    }
     g_Settings->SaveBool(Debugger_SteppingOps, true);
     g_Debugger->WaitForStep();
     if (SkipOp())