From 78dc5d3d1c086bc6b9dd516305ee4185c4df48f2 Mon Sep 17 00:00:00 2001 From: Sour Date: Sun, 7 Jun 2020 13:50:14 -0400 Subject: [PATCH] Debugger: Prevent uninit read breakpoint from triggering when debugger window is closed --- Core/CpuDebugger.cpp | 2 +- Core/GbDebugger.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/CpuDebugger.cpp b/Core/CpuDebugger.cpp index c39ff44..aa78c18 100644 --- a/Core/CpuDebugger.cpp +++ b/Core/CpuDebugger.cpp @@ -141,7 +141,7 @@ void CpuDebugger::ProcessRead(uint32_t addr, uint8_t value, MemoryOperationType if(_memoryAccessCounter->ProcessMemoryRead(addressInfo, _memoryManager->GetMasterClock())) { //Memory access was a read on an uninitialized memory address - if(_enableBreakOnUninitRead && _settings->CheckDebuggerFlag(DebuggerFlags::BreakOnUninitRead)) { + if(_enableBreakOnUninitRead && _settings->CheckDebuggerFlag(DebuggerFlags::CpuDebuggerEnabled) && _settings->CheckDebuggerFlag(DebuggerFlags::BreakOnUninitRead)) { breakSource = BreakSource::BreakOnUninitMemoryRead; _step->StepCount = 0; } diff --git a/Core/GbDebugger.cpp b/Core/GbDebugger.cpp index 19982d9..4c363ca 100644 --- a/Core/GbDebugger.cpp +++ b/Core/GbDebugger.cpp @@ -116,7 +116,7 @@ void GbDebugger::ProcessRead(uint16_t addr, uint8_t value, MemoryOperationType t if(addr < 0xFE00 || addr >= 0xFF80) { if(_memoryAccessCounter->ProcessMemoryRead(addressInfo, _console->GetMasterClock())) { //Memory access was a read on an uninitialized memory address - if(_enableBreakOnUninitRead && _settings->CheckDebuggerFlag(DebuggerFlags::BreakOnUninitRead)) { + if(_enableBreakOnUninitRead && _settings->CheckDebuggerFlag(DebuggerFlags::GbDebuggerEnabled) && _settings->CheckDebuggerFlag(DebuggerFlags::BreakOnUninitRead)) { breakSource = BreakSource::BreakOnUninitMemoryRead; _step->StepCount = 0; }