From 151c435b97891e5a630c624977badea8ca30e38f Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Thu, 1 Mar 2018 08:13:17 +1100
Subject: [PATCH] [Debugger] Disable ABL when a memory BP set

---
 Source/Project64-core/Settings/GameSettings.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Project64-core/Settings/GameSettings.h b/Source/Project64-core/Settings/GameSettings.h
index 2e337eb97..3fe145d25 100644
--- a/Source/Project64-core/Settings/GameSettings.h
+++ b/Source/Project64-core/Settings/GameSettings.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include <Project64-core/N64System/N64Types.h>
+#include <Project64-core/Settings/DebugSettings.h>
 
 class CGameSettings
 {
@@ -20,7 +21,7 @@ public:
     inline static bool UseHleGfx(void) { return m_UseHleGfx; }
     inline static bool bRomInMemory(void) { return m_bRomInMemory; }
     inline static bool bRegCaching(void) { return m_RegCaching; }
-    inline static bool bLinkBlocks(void) { return m_bLinkBlocks; }
+    inline static bool bLinkBlocks(void) { return m_bLinkBlocks && !CDebugSettings::HaveWriteBP() && !CDebugSettings::HaveReadBP(); }
     inline static FUNC_LOOKUP_METHOD LookUpMode(void) { return (FUNC_LOOKUP_METHOD)m_LookUpMode; }
     inline static bool bUseTlb(void) { return m_bUseTlb; }
     inline static uint32_t CountPerOp(void) { return m_CountPerOp; }