Merge pull request #1136 from lioncash/memory-view

DolphinWX: Fix the memory view in the debugger
dolphin-emu · Sep 21, 2014 · 770a9a4 · 770a9a4
2 parents 9206dd0 + dc65ef3
commit 770a9a4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;