From 2ef2f5db1d8a63bb8ce6dff37d2cb35d2cc73f4d Mon Sep 17 00:00:00 2001
From: Ty Lamontagne <amfobes@gmail.com>
Date: Sat, 14 Jan 2023 02:18:42 -0500
Subject: [PATCH] Debugger: Fix step out

---
 pcsx2-qt/Debugger/CpuWidget.cpp | 4 ++--
 pcsx2-qt/Debugger/CpuWidget.h   | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pcsx2-qt/Debugger/CpuWidget.cpp b/pcsx2-qt/Debugger/CpuWidget.cpp
index b9dfbd7c00..f794e55b8e 100644
--- a/pcsx2-qt/Debugger/CpuWidget.cpp
+++ b/pcsx2-qt/Debugger/CpuWidget.cpp
@@ -160,11 +160,11 @@ void CpuWidget::onStepOut()
 	// Allow the cpu to skip this pc if it is a breakpoint
 	CBreakPoints::SetSkipFirst(m_cpu.getCpuType(), m_cpu.getPC());
 
-	if (m_stacklistObjects.size() < 2)
+	if (m_stackModel.rowCount() < 2)
 		return;
 
 	Host::RunOnCPUThread([&] {
-		CBreakPoints::AddBreakPoint(m_cpu.getCpuType(), m_stacklistObjects.at(1).pc, true);
+		CBreakPoints::AddBreakPoint(m_cpu.getCpuType(), m_stackModel.data(m_stackModel.index(1, StackModel::PC), Qt::UserRole).toUInt(), true);
 		m_cpu.resumeCpu();
 	});
 
diff --git a/pcsx2-qt/Debugger/CpuWidget.h b/pcsx2-qt/Debugger/CpuWidget.h
index a7298e4870..4329916ef0 100644
--- a/pcsx2-qt/Debugger/CpuWidget.h
+++ b/pcsx2-qt/Debugger/CpuWidget.h
@@ -105,8 +105,5 @@ private:
 	ThreadModel m_threadModel;
 	StackModel m_stackModel;
 
-	std::vector<EEThread> m_threadlistObjects;
-	std::vector<StackFrame> m_stacklistObjects;
-
 	bool m_demangleFunctions = true;
 };