Merge pull request #5293 from sepalani/mem-ascii

MemoryView: Fix empty string
2017-06-05 20:20:24 -07:00 · 2017-06-05 20:20:24 -07:00 · 2f73bc1735
parent 0b00477c8a f9b4901825
commit 2f73bc1735
1 changed files with 2 additions and 1 deletions
--- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
@ -161,7 +161,8 @@ wxString CMemoryView::ReadMemoryAsString(u32 address) const
    }
  }

-  return StrToWxStr(str);
+  // Not a UTF-8 string
+  return wxString(str.c_str(), wxCSConv(wxFONTENCODING_CP1252), str.size());
 }

 void CMemoryView::OnMouseDownL(wxMouseEvent& event)