From ca0b9481ea2be14032d4599bae3bc243f87b2179 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 16 Aug 2015 01:08:51 -0400 Subject: ChangeGameDialog: Internally set the chosen game name Passing in a reference to an empty string is unnecessary and overcomplicates design. --- Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Source/Core/DolphinWX/NetPlay/NetWindow.cpp') diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index c604e38956..346b8b0932 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -445,17 +445,16 @@ void NetPlayDialog::OnThread(wxThreadEvent& event) void NetPlayDialog::OnChangeGame(wxCommandEvent&) { - wxString game_name; - - ChangeGameDialog cgd(this, m_game_list, game_name); + ChangeGameDialog cgd(this, m_game_list); cgd.ShowModal(); - if (game_name.length()) - { - m_selected_game = WxStrToStr(game_name); - netplay_server->ChangeGame(m_selected_game); - m_game_btn->SetLabel(game_name.Prepend(_(" Game : "))); - } + wxString game_name = cgd.GetChosenGameName(); + if (game_name.empty()) + return; + + m_selected_game = WxStrToStr(game_name); + netplay_server->ChangeGame(m_selected_game); + m_game_btn->SetLabel(game_name.Prepend(_(" Game : "))); } void NetPlayDialog::OnConfigPads(wxCommandEvent&) -- cgit v1.2.3