summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Debugger/MemoryView.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-09-21 15:35:26 -0400
committerLioncash <mathew1800@gmail.com>2014-09-21 15:35:26 -0400
commit770a9a42a504c9506c4c96d4933e326844a9cdde (patch)
treef15686d33c83114dca4b5ce367c288f2de50d736 /Source/Core/DolphinWX/Debugger/MemoryView.cpp
parent9206dd016ec58c78daf1e60ae7879115f956722a (diff)
parentdc65ef33ba51bcbd0b5a7ab633701c122311d0c4 (diff)
Merge pull request #1136 from lioncash/memory-view
DolphinWX: Fix the memory view in the debugger
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp')
-rw-r--r--Source/Core/DolphinWX/Debugger/MemoryView.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
index dd6e3533bb..0fd8f48746 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
@@ -24,6 +24,7 @@
#include "Common/CommonTypes.h"
#include "Common/DebugInterface.h"
#include "Common/StringUtil.h"
+#include "Core/HW/Memmap.h"
#include "DolphinWX/Globals.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/DebuggerUIUtil.h"
@@ -310,6 +311,9 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
dc.SetTextForeground(*wxBLACK);
}
+ if (!Memory::IsRAMAddress(address))
+ continue;
+
if (debugger->IsAlive())
{
std::string dis;