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 +#include 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; }