piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5293 from sepalani/mem-ascii

Browse Source 
MemoryView: Fix empty string
This commit is contained in:
shuffle2 2017-06-05 20:20:24 -07:00 committed by GitHub
commit 2f73bc1735
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/Debugger/MemoryView.cpp
View File

@ -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) void CMemoryView::OnMouseDownL(wxMouseEvent& event)