Fix regression for .elf files in Netplay Game Selector

Rearranged code to look nicer, as well
This commit is contained in:
Corwin Mcknight 2016-05-05 16:43:12 -07:00
parent 1cfeacd5b6
commit 453d7777e5

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)