Merge pull request #5293 from sepalani/mem-ascii

MemoryView: Fix empty string
dolphin-emu · Jun 6, 2017 · 2f73bc1 · 2f73bc1
2 parents 0b00477 + f9b4901
commit 2f73bc1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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)