ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1136 from lioncash/memory-view 

DolphinWX: Fix the memory view in the debugger
This commit is contained in:
Lioncash 2014-09-21 15:35:26 -04:00
parent 9206dd016e dc65ef33ba
commit 770a9a42a5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Debugger/MemoryView.cpp
View File

@ -24,6 +24,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/DebugInterface.h" #include "Common/DebugInterface.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/HW/Memmap.h"
#include "DolphinWX/Globals.h" #include "DolphinWX/Globals.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/DebuggerUIUtil.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h"
@ -310,6 +311,9 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
dc.SetTextForeground(*wxBLACK); dc.SetTextForeground(*wxBLACK);
} }
if (!Memory::IsRAMAddress(address))
continue;
if (debugger->IsAlive()) if (debugger->IsAlive())
{ {
std::string dis; std::string dis;