RMG: save and restore selected server in netplay dialogs

Rosalie241 · Jan 24, 2025 · 5fd9b78 · 5fd9b78
1 parent 881e0c9
commit 5fd9b78
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.cpp b/Source/RMG/UserInterface/Dialog/Netplay/CreateNetplaySessionDialog.cpp
@@ -92,6 +92,12 @@ CreateNetplaySessionDialog::~CreateNetplaySessionDialog(void)
     {
         CoreSettingsSetValue(SettingsID::Netplay_Nickname, nickname.toStdString());
     }
+
+    QString server = this->serverComboBox->currentText();
+    if (!server.isEmpty())
+    {
+        CoreSettingsSetValue(SettingsID::Netplay_SelectedServer, server.toStdString());
+    }
 }
 
 QJsonObject CreateNetplaySessionDialog::GetSessionJson(void)
@@ -182,6 +188,8 @@ void CreateNetplaySessionDialog::on_broadcastSocket_readyRead()
             this->serverComboBox->addItem(servers.at(i), json.value(servers.at(i)).toString());
         }
     }
+
+    NetplayCommon::RestoreSelectedServer(this->serverComboBox);
 }
 
 void CreateNetplaySessionDialog::on_networkAccessManager_Finished(QNetworkReply* reply)
@@ -203,6 +211,8 @@ void CreateNetplaySessionDialog::on_networkAccessManager_Finished(QNetworkReply*
     }
 
     reply->deleteLater();
+
+    NetplayCommon::RestoreSelectedServer(this->serverComboBox);
 }
 
 void CreateNetplaySessionDialog::on_serverComboBox_currentIndexChanged(int index)

diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplayCommon.cpp b/Source/RMG/UserInterface/Dialog/Netplay/NetplayCommon.cpp
@@ -78,3 +78,18 @@ QList<QString> NetplayCommon::GetPluginNames(QString md5QString)
 
     return pluginNames;
 }
+
+void NetplayCommon::RestoreSelectedServer(QComboBox* comboBox)
+{
+    QString server = QString::fromStdString(CoreSettingsGetStringValue(SettingsID::Netplay_SelectedServer));
+    if (server.isEmpty())
+    {
+        return;
+    }
+
+    int index = comboBox->findText(server);
+    if (index >= 0)
+    {
+        comboBox->setCurrentIndex(index);
+    }
+}
diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplayCommon.hpp b/Source/RMG/UserInterface/Dialog/Netplay/NetplayCommon.hpp
@@ -11,6 +11,7 @@
 #define NETPLAYCOMMON_HPP
 
 #include <QJsonObject>
+#include <QComboBox>
 #include <QString>
 
 namespace NetplayCommon
@@ -24,6 +25,8 @@ namespace NetplayCommon
 
     // Retrieves RSP and GFX plugin names
     QList<QString> GetPluginNames(QString md5QString);
+
+    void RestoreSelectedServer(QComboBox* comboBox);
 }
 
 #endif // NETPLAYCOMMON_HPP
diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.cpp b/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.cpp
@@ -87,6 +87,12 @@ NetplaySessionBrowserDialog::~NetplaySessionBrowserDialog(void)
     {
         CoreSettingsSetValue(SettingsID::Netplay_Nickname, nickname.toStdString());
     }
+
+    QString server = this->serverComboBox->currentText();
+    if (!server.isEmpty())
+    {
+        CoreSettingsSetValue(SettingsID::Netplay_SelectedServer, server.toStdString());
+    }
 }
 
 QJsonObject NetplaySessionBrowserDialog::GetSessionJson(void)
@@ -255,6 +261,8 @@ void NetplaySessionBrowserDialog::on_broadcastSocket_readyRead(void)
             this->serverComboBox->addItem(servers.at(i), json.value(servers.at(i)).toString());
         }
     }
+
+    NetplayCommon::RestoreSelectedServer(this->serverComboBox);
 }
 
 void NetplaySessionBrowserDialog::on_networkAccessManager_Finished(QNetworkReply* reply)
@@ -277,6 +285,8 @@ void NetplaySessionBrowserDialog::on_networkAccessManager_Finished(QNetworkReply
     }
 
     reply->deleteLater();
+
+    NetplayCommon::RestoreSelectedServer(this->serverComboBox);
 }
 
 void NetplaySessionBrowserDialog::on_serverComboBox_currentIndexChanged(int index)