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 #403 from RachelBryk/netplay-player-selection 

When updating netplay player list, reselect by string instead of index.
This commit is contained in:
shuffle2 2014-05-29 13:52:44 -07:00
parent e0edf31608 b1029223c6
commit fee69236d5
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/DolphinWX/NetWindow.cpp
View File

@ -539,14 +539,29 @@ void NetPlayDiag::OnThread(wxCommandEvent& event)
std::string tmps; std::string tmps;
netplay_client->GetPlayerList(tmps, m_playerids); netplay_client->GetPlayerList(tmps, m_playerids);
const int selection = m_player_lbox->GetSelection(); wxString selection;
if (m_player_lbox->GetSelection() != wxNOT_FOUND)
selection = m_player_lbox->GetString(m_player_lbox->GetSelection());
m_player_lbox->Clear(); m_player_lbox->Clear();
std::istringstream ss(tmps); std::istringstream ss(tmps);
while (std::getline(ss, tmps)) while (std::getline(ss, tmps))
m_player_lbox->Append(StrToWxStr(tmps)); m_player_lbox->Append(StrToWxStr(tmps));
m_player_lbox->SetSelection(selection); // remove ping from selection string, in case it has changed
selection.erase(selection.find_last_of("|") + 1);
if (selection.Length() > 0)
{
for (unsigned int i = 0; i < m_player_lbox->GetCount(); ++i)
{
if (selection == m_player_lbox->GetString(i).Mid(0, selection.Length()))
{
m_player_lbox->SetSelection(i);
break;
}
}
}
switch (event.GetId()) switch (event.GetId())
{ {