summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2023-02-14 18:44:16 +0100
committerJosJuice <josjuice@gmail.com>2023-02-14 18:44:16 +0100
commit5b6784432c128aaa7df750fa4776bd59bd59386b (patch)
treef2c404a034c3185c33d431c1471054ce2b536543 /Source
parent9d139ea84e426a0829fcb7c8bd1959f341427349 (diff)
Follow-up fixes for "Properly lock CPU before accessing emulated memory"
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp4
-rw-r--r--Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp1
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"