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

9
src/citra_qt/multiplayer/direct_connect.cpp
View file

@ -17,6 +17,7 @@
#include "citra_qt/ui_settings.h"
#include "core/settings.h"
#include "network/network.h"
#include "ui_direct_connect.h"
enum class ConnectionType : u8 { TraversalServer, IP };
@ -30,11 +31,11 @@ DirectConnectWindow::DirectConnectWindow(QWidget* parent)
watcher = new QFutureWatcher<void>;
connect(watcher, &QFutureWatcher<void>::finished, this, &DirectConnectWindow::OnConnection);
ui->nickname->setValidator(Validation::get().nickname);
ui->nickname->setValidator(validation.GetNickname());
ui->nickname->setText(UISettings::values.nickname);
ui->ip->setValidator(Validation::get().ip);
ui->ip->setValidator(validation.GetIP());
ui->ip->setText(UISettings::values.ip);
ui->port->setValidator(Validation::get().port);
ui->port->setValidator(validation.GetPort());
ui->port->setText(UISettings::values.port);
// TODO(jroweboy): Show or hide the connection options based on the current value of the combo
@ -42,6 +43,8 @@ DirectConnectWindow::DirectConnectWindow(QWidget* parent)
connect(ui->connect, &QPushButton::pressed, this, &DirectConnectWindow::Connect);
}
DirectConnectWindow::~DirectConnectWindow() = default;
void DirectConnectWindow::Connect() {
if (!ui->nickname->hasAcceptableInput()) {
NetworkMessage::ShowError(NetworkMessage::USERNAME_NOT_VALID);