diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-08-16 01:04:06 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-08-17 21:56:46 -0400 |
| commit | af35f38491e39e5b030a55784f3a247d3453d7ba (patch) | |
| tree | 291a1d7807a2be50b72f2d078f44c9bf417734d6 /Source/Core/DolphinWX/NetPlay/NetWindow.cpp | |
| parent | 11f3ded2966726680908deb4505cad41da2938c1 (diff) | |
NetWindow: Minor simplifications
Diffstat (limited to 'Source/Core/DolphinWX/NetPlay/NetWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index 594918b5ab..c604e38956 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -383,13 +383,13 @@ void NetPlayDialog::OnThread(wxThreadEvent& event) m_player_lbox->Append(StrToWxStr(tmps)); // remove ping from selection string, in case it has changed - selection.erase(selection.find_last_of("|") + 1); + selection.erase(selection.rfind('|') + 1); if (!selection.empty()) { for (unsigned int i = 0; i < m_player_lbox->GetCount(); ++i) { - if (selection == m_player_lbox->GetString(i).Mid(0, selection.length())) + if (selection == m_player_lbox->GetString(i).substr(0, selection.length())) { m_player_lbox->SetSelection(i); break; @@ -413,7 +413,7 @@ void NetPlayDialog::OnThread(wxThreadEvent& event) case NP_GUI_EVT_CHANGE_GAME: // update selected game :/ { - m_selected_game.assign(WxStrToStr(event.GetString())); + m_selected_game = WxStrToStr(event.GetString()); wxString button_label = event.GetString(); m_game_btn->SetLabel(button_label.Prepend(_(" Game : "))); @@ -471,7 +471,7 @@ void NetPlayDialog::OnKick(wxCommandEvent&) { wxString selection = m_player_lbox->GetStringSelection(); unsigned long player = 0; - selection.Mid(selection.find_last_of("[") + 1, selection.find_last_of("]")).ToULong(&player); + selection.substr(selection.rfind('[') + 1, selection.rfind(']')).ToULong(&player); netplay_server->KickPlayer((u8)player); @@ -482,10 +482,7 @@ void NetPlayDialog::OnKick(wxCommandEvent&) void NetPlayDialog::OnPlayerSelect(wxCommandEvent&) { - if (m_player_lbox->GetSelection() > 0) - m_kick_btn->Enable(); - else - m_kick_btn->Disable(); + m_kick_btn->Enable(m_player_lbox->GetSelection() > 0); } bool NetPlayDialog::IsRecording() @@ -493,7 +490,6 @@ bool NetPlayDialog::IsRecording() return m_record_chkbox->GetValue(); } - void NetPlayDialog::OnCopyIP(wxCommandEvent&) { if (m_host_copy_btn_is_retry) |