summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Debugger/MemoryView.cpp
diff options
context:
space:
mode:
authorSepalani <sepalani@hotmail.fr>2017-04-20 22:04:10 +0100
committerSepalani <sepalani@hotmail.fr>2017-04-29 20:28:49 +0100
commitf9b4901825ce29831ccdd8adaa230790d0109a3e (patch)
tree3210595a2c2cfaa3b187be9096a3d053d8afc97b /Source/Core/DolphinWX/Debugger/MemoryView.cpp
parenta2cba6d72f049e86460491c875353584e167d613 (diff)
MemoryView: Fix empty string
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp')
-rw-r--r--Source/Core/DolphinWX/Debugger/MemoryView.cpp3
1 files changed, 2 insertions, 1 deletions
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)