diff options
| author | yuzubot <yuzu@yuzu-emu.org> | 2023-07-24 12:03:10 +0000 |
|---|---|---|
| committer | yuzubot <yuzu@yuzu-emu.org> | 2023-07-24 12:03:10 +0000 |
| commit | 0bbca96087416175098ea8f0b049a5c60e0774b7 (patch) | |
| tree | bdaa6868599c33ce3469f43974f0c4e292affaf7 /src/yuzu/multiplayer/lobby.cpp | |
| parent | 3e4029b238bf1b604754175f9a100765f0b5a081 (diff) | |
"Merge Tagged PR 10839"mainline-0-1505
Diffstat (limited to 'src/yuzu/multiplayer/lobby.cpp')
| -rw-r--r-- | src/yuzu/multiplayer/lobby.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/yuzu/multiplayer/lobby.cpp b/src/yuzu/multiplayer/lobby.cpp index 387f6f7c91..603e9ae3de 100644 --- a/src/yuzu/multiplayer/lobby.cpp +++ b/src/yuzu/multiplayer/lobby.cpp @@ -60,7 +60,8 @@ Lobby::Lobby(QWidget* parent, QStandardItemModel* list, ui->room_list->setContextMenuPolicy(Qt::CustomContextMenu); ui->nickname->setValidator(validation.GetNickname()); - ui->nickname->setText(UISettings::values.multiplayer_nickname.GetValue()); + ui->nickname->setText( + QString::fromStdString(UISettings::values.multiplayer_nickname.GetValue())); // Try find the best nickname by default if (ui->nickname->text().isEmpty() || ui->nickname->text() == QStringLiteral("yuzu")) { @@ -202,9 +203,9 @@ void Lobby::OnJoinRoom(const QModelIndex& source) { // TODO(jroweboy): disable widgets and display a connecting while we wait // Save settings - UISettings::values.multiplayer_nickname = ui->nickname->text(); + UISettings::values.multiplayer_nickname = ui->nickname->text().toStdString(); UISettings::values.multiplayer_ip = - proxy->data(connection_index, LobbyItemHost::HostIPRole).toString(); + proxy->data(connection_index, LobbyItemHost::HostIPRole).value<QString>().toStdString(); UISettings::values.multiplayer_port = proxy->data(connection_index, LobbyItemHost::HostPortRole).toInt(); emit SaveConfig(); |