From 0296dde9e95dbb452e2d2546f973f54b8aac9b05 Mon Sep 17 00:00:00 2001 From: Sour Date: Mon, 18 Feb 2019 20:42:29 -0500 Subject: [PATCH] Debugger: Fixed crash when mixing breakpoints that have conditions with others that don't within the same breakpoint type --- Core/Debugger.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/Debugger.cpp b/Core/Debugger.cpp index 69830967..c5051497 100644 --- a/Core/Debugger.cpp +++ b/Core/Debugger.cpp @@ -307,10 +307,12 @@ void Debugger::SetBreakpoints(Breakpoint breakpoints[], uint32_t length) if((bp.IsMarked() || isEnabled) && bp.HasBreakpointType((BreakpointType)i)) { _breakpoints[i].push_back(bp); - bool success = true; if(bp.HasCondition()) { + bool success = true; ExpressionData data = _bpExpEval->GetRpnList(bp.GetCondition(), success); _breakpointRpnList[i].push_back(success ? data : ExpressionData()); + } else { + _breakpointRpnList[i].push_back(ExpressionData()); } if(isEnabled) {