diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-06-28 06:08:24 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-06-28 06:08:24 -0400 |
| commit | 2e2c98412253d7a38da02aa970daa7bfea43202a (patch) | |
| tree | 0c09798c2350f5790f43cb72f44ffe1018293b67 /Source/Core | |
| parent | 69b7296fc257cd856a195122b41a23848c6b85c2 (diff) | |
| parent | 66136fc710a2d583d2fef905d667e176c43e6080 (diff) | |
Merge pull request #2672 from JosJuice/fix-gamelist-encoding-2
Fix more game list name encoding errors caused by 4.0-6419 (d7900b4)
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/GameListCtrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 34f50ef4d5..0c847387ba 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -403,7 +403,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) if (line.substr(0,rISOFile.GetUniqueID().size()) == rISOFile.GetUniqueID()) { - name = line.substr(rISOFile.GetUniqueID().size() + 3); + name = StrToWxStr(line.substr(rISOFile.GetUniqueID().size() + 3)); break; } } @@ -413,7 +413,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) std::string title; IniFile gameini = SCoreStartupParameter::LoadGameIni(rISOFile.GetUniqueID(), rISOFile.GetRevision()); if (gameini.GetIfExists("EmuState", "Title", &title)) - name = title; + name = StrToWxStr(title); int disc_number = rISOFile.GetDiscNumber() + 1; if (disc_number > 1 && name.Lower().find(wxString::Format("disc %i", disc_number)) == std::string::npos |