Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix player list not showing in lobby. Fix host and direct connect crashing citra

Browse source
This commit is contained in:
James Rowe 2018-04-18 10:29:03 -06:00
parent 01b49b7e78
commit 2be02f221d
11 changed files with 68 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/citra_qt/multiplayer/lobby.cpp
View file

@ -47,7 +47,7 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list,
ui->room_list->setExpandsOnDoubleClick(false);
ui->room_list->setContextMenuPolicy(Qt::CustomContextMenu);
ui->nickname->setValidator(Validation::get().nickname);
ui->nickname->setValidator(validation.GetNickname());
ui->nickname->setText(UISettings::values.nickname);
// UI Buttons
@ -189,7 +189,6 @@ void Lobby::OnRefreshLobby() {
first_item->appendRow(new LobbyItemExpandedMemberList(members));
}
}
proxy->setSourceModel(model);
// Reenable the refresh button and resize the columns
ui->refresh_list->setEnabled(true);
@ -200,10 +199,10 @@ void Lobby::OnRefreshLobby() {
}
// Set the member list child items to span all columns
for (int i = 0; i < model->rowCount(); i++) {
for (int i = 0; i < proxy->rowCount(); i++) {
auto parent = model->item(i, 0);
if (parent->hasChildren()) {
ui->room_list->setFirstColumnSpanned(0, parent->index(), true);
ui->room_list->setFirstColumnSpanned(0, proxy->index(i, 0), true);
}
}
}