Merge pull request #4284 from leoetlino/memview-crash-fix

MemoryView: Don't segfault if Core isn't running
2016-10-03 15:04:41 -07:00 · 2016-10-03 15:04:41 -07:00 · 05d6157c9b
parent be6aeaad33 6fba48cd15
commit 05d6157c9b
1 changed files with 3 additions and 3 deletions
--- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
@ -312,11 +312,11 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
      dc.SetTextForeground(*wxBLACK);
    }

+    if (debugger->IsAlive())
+    {
      if (!PowerPC::HostIsRAMAddress(address))
        continue;

-    if (debugger->IsAlive())
-    {
      std::string dis;
      u32 mem_data = debugger->ReadExtraMemory(memory, address);