From f9b4901825ce29831ccdd8adaa230790d0109a3e Mon Sep 17 00:00:00 2001 From: Sepalani Date: Thu, 20 Apr 2017 22:04:10 +0100 Subject: [PATCH] MemoryView: Fix empty string --- Source/Core/DolphinWX/Debugger/MemoryView.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 80c4efa5d7..b7dbf345e7 100644 --- 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)