From fd4997ab94183b24ccc6c806c52f188832af61f9 Mon Sep 17 00:00:00 2001
From: BoopFtang <a.miles.nz@gmail.com>
Date: Fri, 12 Feb 2016 20:47:12 +1300
Subject: [PATCH] StepOut breakpoint fix

Fixes #1164
SetSkipFirst wasn't called
---
 pcsx2/gui/Debugger/DisassemblyDialog.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
index fa95636bf2..c1c5d0030f 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
@@ -458,6 +458,8 @@ void DisassemblyDialog::stepOut()
 {
 	if (!r5900Debug.isAlive() || !r5900Debug.isCpuPaused() || currentCpu == NULL)
 		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();
 	if (addr == (u32)-1)