ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Jules Blok 2015-06-28 13:28:23 +02:00
parent a71e81a143 2e2c984122
commit 1120132d26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -402,7 +402,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
if (line.substr(0,rISOFile.GetUniqueID().size()) == rISOFile.GetUniqueID()) 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; break;
} }
} }
@ -412,7 +412,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
std::string title; std::string title;
IniFile gameini = SConfig::LoadGameIni(rISOFile.GetUniqueID(), rISOFile.GetRevision()); IniFile gameini = SConfig::LoadGameIni(rISOFile.GetUniqueID(), rISOFile.GetRevision());
if (gameini.GetIfExists("EmuState", "Title", &title)) if (gameini.GetIfExists("EmuState", "Title", &title))
name = title; name = StrToWxStr(title);
int disc_number = rISOFile.GetDiscNumber() + 1; int disc_number = rISOFile.GetDiscNumber() + 1;
if (disc_number > 1 && name.Lower().find(wxString::Format("disc %i", disc_number)) == std::string::npos if (disc_number > 1 && name.Lower().find(wxString::Format("disc %i", disc_number)) == std::string::npos