diff options
| author | yuzubot <yuzu@yuzu-emu.org> | 2023-07-26 12:03:30 +0000 |
|---|---|---|
| committer | yuzubot <yuzu@yuzu-emu.org> | 2023-07-26 12:03:30 +0000 |
| commit | 40a9d4584fcbf9fa44ab8a54f7124aaa30309fcf (patch) | |
| tree | 7536a0df94bc785081aff14b5ee4e0538c8029cb /src/yuzu/multiplayer/direct_connect.cpp | |
| parent | 745cb55185ac4353494b209a419a067d31802851 (diff) | |
"Merge Tagged PR 10839"mainline-0-1508
Diffstat (limited to 'src/yuzu/multiplayer/direct_connect.cpp')
| -rw-r--r-- | src/yuzu/multiplayer/direct_connect.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/yuzu/multiplayer/direct_connect.cpp b/src/yuzu/multiplayer/direct_connect.cpp index d71cc23a72..a415a953f6 100644 --- a/src/yuzu/multiplayer/direct_connect.cpp +++ b/src/yuzu/multiplayer/direct_connect.cpp @@ -34,13 +34,14 @@ DirectConnectWindow::DirectConnectWindow(Core::System& system_, QWidget* parent) connect(watcher, &QFutureWatcher<void>::finished, this, &DirectConnectWindow::OnConnection); ui->nickname->setValidator(validation.GetNickname()); - ui->nickname->setText(UISettings::values.multiplayer_nickname.GetValue()); + ui->nickname->setText( + QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue())); if (ui->nickname->text().isEmpty() && !Settings::values.yuzu_username.GetValue().empty()) { // Use yuzu Web Service user name as nickname by default ui->nickname->setText(QString::fromStdString(Settings::values.yuzu_username.GetValue())); } ui->ip->setValidator(validation.GetIP()); - ui->ip->setText(UISettings::values.multiplayer_ip.GetValue()); + ui->ip->setText(QString::fromStdString(UISettings::values.multiplayer_ip.GetValue())); ui->port->setValidator(validation.GetPort()); ui->port->setText(QString::number(UISettings::values.multiplayer_port.GetValue())); @@ -91,8 +92,8 @@ void DirectConnectWindow::Connect() { } // Store settings - UISettings::values.multiplayer_nickname = ui->nickname->text(); - UISettings::values.multiplayer_ip = ui->ip->text(); + UISettings::values.multiplayer_nickname = ui->nickname->text().toStdString(); + UISettings::values.multiplayer_ip = ui->ip->text().toStdString(); if (ui->port->isModified() && !ui->port->text().isEmpty()) { UISettings::values.multiplayer_port = ui->port->text().toInt(); } else { |