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

Fixes #1161 

In the case of a disabled breakpoint at the address, false would be
returned without checking for temp breakpoint
This commit is contained in:
BoopFtang 2016-02-10 15:54:56 +13:00
parent 5b74374bb2
commit 83a877c3dc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/DebugTools/Breakpoints.cpp
View File

@ -153,6 +153,10 @@ size_t CBreakPoints::FindMemCheck(u32 start, u32 end)
bool CBreakPoints::IsAddressBreakPoint(u32 addr) bool CBreakPoints::IsAddressBreakPoint(u32 addr)
{ {
size_t bp = FindBreakpoint(addr); size_t bp = FindBreakpoint(addr);
if (bp != INVALID_BREAKPOINT && breakPoints_[bp].enabled)
return true;
// Check again for overlapping temp breakpoint
bp = FindBreakpoint(addr, true, true);
return bp != INVALID_BREAKPOINT && breakPoints_[bp].enabled; return bp != INVALID_BREAKPOINT && breakPoints_[bp].enabled;
} }