From 453d7777e5e8cdb186561bb20faa5ab6b6f1a9a9 Mon Sep 17 00:00:00 2001 From: Corwin Mcknight Date: Thu, 5 May 2016 16:43:12 -0700 Subject: [PATCH] Fix regression for .elf files in Netplay Game Selector Rearranged code to look nicer, as well --- Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index 61a59b1460..9274b2b9aa 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -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(ss, ", ")); - ss << info.back(); - return name + " (" + ss.str() + ")"; - } + std::ostringstream ss; + std::copy(info.begin(), info.end() -1, std::ostream_iterator(ss, ", ")); + ss << info.back(); + return name + " (" + ss.str() + ")"; } void NetPlayDialog::FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list)