diff --git a/pcsx2/DebugTools/Breakpoints.cpp b/pcsx2/DebugTools/Breakpoints.cpp index bb84b41da2..09decdcb6e 100644 --- a/pcsx2/DebugTools/Breakpoints.cpp +++ b/pcsx2/DebugTools/Breakpoints.cpp @@ -268,7 +268,12 @@ void CBreakPoints::ChangeBreakPointRemoveCond(u32 addr) BreakPointCond *CBreakPoints::GetBreakPointCondition(u32 addr) { - size_t bp = FindBreakpoint(addr, true, false); + size_t bp = FindBreakpoint(addr, true, true); + //temp breakpoints are unconditional + if (bp != INVALID_BREAKPOINT) + return NULL; + + bp = FindBreakpoint(addr, true, false); if (bp != INVALID_BREAKPOINT && breakPoints_[bp].hasCond) return &breakPoints_[bp].cond; return NULL;