From 203ecb534d65287a16cb1565ab69ee10a02ab0bf Mon Sep 17 00:00:00 2001 From: Techjar Date: Mon, 29 Oct 2018 17:00:37 -0400 Subject: NetPlay: Fix saving host game selection --- .../Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp') diff --git a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp index 6f7818e2b0..25f44ba4db 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -51,13 +52,6 @@ NetPlaySetupDialog::NetPlaySetupDialog(QWidget* parent) OnConnectionTypeChanged(m_connection_type->currentIndex()); - int selected_game = Settings::GetQSettings().value(QStringLiteral("netplay/hostgame"), 0).toInt(); - - if (selected_game >= m_host_games->count()) - selected_game = 0; - - m_host_games->setCurrentItem(m_host_games->item(selected_game)); - ConnectWidgets(); } @@ -161,8 +155,9 @@ void NetPlaySetupDialog::ConnectWidgets() connect(m_host_port_box, static_cast(&QSpinBox::valueChanged), this, &NetPlaySetupDialog::SaveSettings); connect(m_host_games, static_cast(&QListWidget::currentRowChanged), - [](int index) { - Settings::GetQSettings().setValue(QStringLiteral("netplay/hostgame"), index); + [this](int index) { + Settings::GetQSettings().setValue(QStringLiteral("netplay/hostgame"), + m_host_games->item(index)->text()); }); connect(m_host_games, &QListWidget::itemDoubleClicked, this, &NetPlaySetupDialog::accept); @@ -251,6 +246,8 @@ void NetPlaySetupDialog::accept() void NetPlaySetupDialog::PopulateGameList() { + QSignalBlocker blocker(m_host_games); + m_host_games->clear(); for (int i = 0; i < m_game_list_model->rowCount(QModelIndex()); i++) { @@ -263,6 +260,14 @@ void NetPlaySetupDialog::PopulateGameList() } m_host_games->sortItems(); + + QString selected_game = Settings::GetQSettings() + .value(QStringLiteral("netplay/hostgame"), QStringLiteral("")) + .toString(); + auto find_list = m_host_games->findItems(selected_game, Qt::MatchFlag::MatchExactly); + + if (find_list.count() > 0) + m_host_games->setCurrentItem(find_list[0]); } void NetPlaySetupDialog::ResetTraversalHost() -- cgit v1.2.3