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

Merge pull request #1174 from NZJenkins/stepOut-Fix 

StepOut breakpoint fix
This commit is contained in:
Jonathan Li 2016-02-14 11:39:39 +00:00
parent 8ae7f60b04 fd4997ab94
commit 1718d07f94
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/Debugger/DisassemblyDialog.cpp
View File

@ -458,6 +458,8 @@ void DisassemblyDialog::stepOut()
{ {
if (!r5900Debug.isAlive() || !r5900Debug.isCpuPaused() || currentCpu == NULL) if (!r5900Debug.isAlive() || !r5900Debug.isCpuPaused() || currentCpu == NULL)
return; return;
// If the current PC is on a breakpoint, the user doesn't want to do nothing.
CBreakPoints::SetSkipFirst(r5900Debug.getPC());
u32 addr = currentCpu->getStepOutAddress(); u32 addr = currentCpu->getStepOutAddress();
if (addr == (u32)-1) if (addr == (u32)-1)