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

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

View file

@ -20,6 +20,7 @@
#include "common/logging/log.h"
#include "core/announce_multiplayer_session.h"
#include "core/settings.h"
#include "ui_host_room.h"
HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list,
std::shared_ptr<Core::AnnounceMultiplayerSession> session)
@ -28,9 +29,9 @@ HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list,
ui->setupUi(this);
// set up validation for all of the fields
ui->room_name->setValidator(Validation::get().room_name);
ui->username->setValidator(Validation::get().nickname);
ui->port->setValidator(Validation::get().port);
ui->room_name->setValidator(validation.GetRoomName());
ui->username->setValidator(validation.GetNickname());
ui->port->setValidator(validation.GetPort());
ui->port->setPlaceholderText(QString::number(Network::DefaultRoomPort));
// Create a proxy to the game list to display the list of preferred games
@ -57,6 +58,8 @@ HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list,
}
}
HostRoomWindow::~HostRoomWindow() = default;
void HostRoomWindow::Host() {
if (!ui->username->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::USERNAME_NOT_VALID);