From 5b6784432c128aaa7df750fa4776bd59bd59386b Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Tue, 14 Feb 2023 18:44:16 +0100
Subject: [PATCH] Follow-up fixes for "Properly lock CPU before accessing
 emulated memory"

---
 Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp   | 4 ++--
 Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
index a505060566..e843420b1e 100644
--- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
@@ -754,7 +754,7 @@ void CodeViewWidget::OnCopyTargetAddress()
   const std::optional<u32> target_addr =
       PowerPC::debug_interface.GetMemoryAddressFromInstruction(code_line);
 
-  if (addr)
+  if (target_addr)
   {
     QApplication::clipboard()->setText(
         QStringLiteral("%1").arg(*target_addr, 8, 16, QLatin1Char('0')));
@@ -784,7 +784,7 @@ void CodeViewWidget::OnShowTargetInMemory()
   const std::optional<u32> target_addr =
       PowerPC::debug_interface.GetMemoryAddressFromInstruction(code_line);
 
-  if (addr)
+  if (target_addr)
     emit ShowMemory(*target_addr);
 }
 
diff --git a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
index 6c08d9a403..04c8313dcf 100644
--- a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
@@ -18,7 +18,6 @@
 #include <fmt/printf.h>
 
 #include "Common/Align.h"
-#include "Common/Assert.h"
 #include "Common/FloatUtils.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"