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

Merge pull request #3820 from Lionel07/netplay-elf-title-regression 

Fix regression for .elf files in Netplay Game Selector
This commit is contained in:
Matthew Parlane 2016-05-07 19:47:13 +12:00
parent 48237b38e8 453d7777e5
commit 461a48f8e3
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -80,6 +80,8 @@ static std::string BuildGameName(const GameListItem& game)
}
std::string name(game.GetName(lang));
if (name.empty())
name = game.GetName();
int disc_number = game.GetDiscNumber() + 1;
@ -92,16 +94,12 @@ static std::string BuildGameName(const GameListItem& game)
std::string disc_text = "Disc ";
info.push_back(disc_text + std::to_string(disc_number));
}
if (info.empty())
return name;
else
{
std::ostringstream ss;
std::copy(info.begin(), info.end() -1, std::ostream_iterator<std::string>(ss, ", "));
ss << info.back();
return name + " (" + ss.str() + ")";
}
std::ostringstream ss;
std::copy(info.begin(), info.end() -1, std::ostream_iterator<std::string>(ss, ", "));
ss << info.back();
return name + " (" + ss.str() + ")";
}
void NetPlayDialog::FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list)