ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1377 from NZJenkins/master 

GetBreakPointCondition handle temp breakpoints
This commit is contained in:
Jonathan Li 2016-05-30 15:12:36 +01:00
parent 9c8b5e37a4 6bc02cbb45
commit c2b31c0987
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/DebugTools/Breakpoints.cpp
View File

@ -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;