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 #4284 from leoetlino/memview-crash-fix 

MemoryView: Don't segfault if Core isn't running
This commit is contained in:
shuffle2 2016-10-03 15:04:41 -07:00 committed by GitHub
parent be6aeaad33 6fba48cd15
commit 05d6157c9b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,11 +312,11 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
dc.SetTextForeground(*wxBLACK); dc.SetTextForeground(*wxBLACK);
} }
if (debugger->IsAlive())
{
if (!PowerPC::HostIsRAMAddress(address)) if (!PowerPC::HostIsRAMAddress(address))
continue; continue;
if (debugger->IsAlive())
{
std::string dis; std::string dis;
u32 mem_data = debugger->ReadExtraMemory(memory, address); u32 mem_data = debugger->ReadExtraMemory(memory, address);