From 40aea8d6b8e968ac7da23698e0d1b951961c61b9 Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Tue, 17 Jul 2018 15:25:00 +0800 Subject: [PATCH] citra_qt: use Citra Web Service username as default multiplayer nickname --- src/citra_qt/multiplayer/direct_connect.cpp | 4 ++++ src/citra_qt/multiplayer/host_room.cpp | 4 ++++ src/citra_qt/multiplayer/lobby.cpp | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/citra_qt/multiplayer/direct_connect.cpp b/src/citra_qt/multiplayer/direct_connect.cpp index 5cfd3ced8..482679011 100644 --- a/src/citra_qt/multiplayer/direct_connect.cpp +++ b/src/citra_qt/multiplayer/direct_connect.cpp @@ -33,6 +33,10 @@ DirectConnectWindow::DirectConnectWindow(QWidget* parent) ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); + if (ui->nickname->text().isEmpty() && !Settings::values.citra_username.empty()) { + // Use Citra Web Service user name as nickname by default + ui->nickname->setText(QString::fromStdString(Settings::values.citra_username)); + } ui->ip->setValidator(validation.GetIP()); ui->ip->setText(UISettings::values.ip); ui->port->setValidator(validation.GetPort()); diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 8366f8747..d08866b13 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -54,6 +54,10 @@ HostRoomWindow::HostRoomWindow(QWidget* parent, QStandardItemModel* list, // Restore the settings: ui->username->setText(UISettings::values.room_nickname); + if (ui->username->text().isEmpty() && !Settings::values.citra_username.empty()) { + // Use Citra Web Service user name as nickname by default + ui->username->setText(QString::fromStdString(Settings::values.citra_username)); + } ui->room_name->setText(UISettings::values.room_name); ui->port->setText(UISettings::values.room_port); ui->max_player->setValue(UISettings::values.max_player); diff --git a/src/citra_qt/multiplayer/lobby.cpp b/src/citra_qt/multiplayer/lobby.cpp index edb73c6c8..c40c00375 100644 --- a/src/citra_qt/multiplayer/lobby.cpp +++ b/src/citra_qt/multiplayer/lobby.cpp @@ -48,6 +48,10 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list, ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); + if (ui->nickname->text().isEmpty() && !Settings::values.citra_username.empty()) { + // Use Citra Web Service user name as nickname by default + ui->nickname->setText(QString::fromStdString(Settings::values.citra_username)); + } // UI Buttons connect(ui->refresh_list, &QPushButton::pressed, this, &Lobby::RefreshLobby);