mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-21 11:51:48 +02:00
Merge pull request #5293 from sepalani/mem-ascii
MemoryView: Fix empty string
This commit is contained in:
commit
2f73bc1735
1 changed files with 2 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue