From ef1520c2c686172e380fdc9c58a01299216b55b0 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Mon, 20 Feb 2023 02:56:04 +0100 Subject: [PATCH 1/2] Qt/CodeViewWidget: Don't try to pause emulator in Update() if we happen to be on a breakpoint. --- Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp index 15c76289b4..7b976e3cc1 100644 --- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp @@ -295,9 +295,6 @@ void CodeViewWidget::Update(const Core::CPUThreadGuard* guard) u32 pc = PowerPC::ppcState.pc; - if (Core::GetState() != Core::State::Paused && PowerPC::debug_interface.IsBreakpoint(pc)) - Core::SetState(Core::State::Paused); - const bool dark_theme = qApp->palette().color(QPalette::Base).valueF() < 0.5; m_branches.clear(); From 4e6c89fbfd0e0495163d609d745d92e7c1449a9d Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Mon, 20 Feb 2023 03:10:12 +0100 Subject: [PATCH 2/2] Qt/CodeViewWidget: Don't read PC in Update() if we don't have a CPU thread guard. --- Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp index 7b976e3cc1..218350e568 100644 --- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp @@ -293,7 +293,7 @@ void CodeViewWidget::Update(const Core::CPUThreadGuard* guard) for (int i = 0; i < rows; i++) setRowHeight(i, rowh); - u32 pc = PowerPC::ppcState.pc; + const std::optional pc = guard ? std::make_optional(PowerPC::ppcState.pc) : std::nullopt; const bool dark_theme = qApp->palette().color(QPalette::Base).valueF() < 0.5;