diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-06-28 13:28:23 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-06-28 13:28:23 +0200 |
| commit | 1120132d261f08fae7bb19933a4d814d52eca8a3 (patch) | |
| tree | 0d4cb781127a602bbc2c0138f055028c88b10102 /Source | |
| parent | a71e81a1435e91e3d807bc5f13b674bc9e6d7ed9 (diff) | |
| parent | 2e2c98412253d7a38da02aa970daa7bfea43202a (diff) | |
Merge branch 'stable'
Diffstat (limited to 'Source')
| -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 e1cbabc555..1b967a5f7c 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -402,7 +402,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; } } @@ -412,7 +412,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) std::string title; IniFile gameini = SConfig::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 |