Merge pull request #11563 from JosJuice/host-lock-cpu-fixups

Follow-up fixes for "Properly lock CPU before accessing emulated memory"
dolphin-emu · Feb 14, 2023 · 22ed084 · 22ed084
2 parents ba3c38a + 5b67844
commit 22ed084
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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"