From 0ce813b8262da0f838b0a545c033e28af9c1e67e Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Sun, 6 Dec 2020 03:36:27 +0100
Subject: [PATCH] restore saved previous server (#4206)

fix #3617
---
 cockatrice/src/dlg_connect.cpp              | 5 +++--
 cockatrice/src/settings/serverssettings.cpp | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp
index bf34c68f..df290d64 100644
--- a/cockatrice/src/dlg_connect.cpp
+++ b/cockatrice/src/dlg_connect.cpp
@@ -193,12 +193,13 @@ void DlgConnect::rebuildComboBoxList(int failure)
     savedHostList = uci.getServerInfo();
 
     bool autoConnectEnabled = static_cast<bool>(SettingsCache::instance().servers().getAutoConnect());
+    QString previousHostName = SettingsCache::instance().servers().getPrevioushostName();
     QString autoConnectSaveName = SettingsCache::instance().servers().getSaveName();
 
     int index = 0;
 
     for (const auto &pair : savedHostList) {
-        auto tmp = pair.second;
+        const auto &tmp = pair.second;
         QString saveName = tmp.getSaveName();
         if (saveName.size()) {
             previousHosts->addItem(saveName);
@@ -207,7 +208,7 @@ void DlgConnect::rebuildComboBoxList(int failure)
                 if (saveName.compare(autoConnectSaveName) == 0) {
                     previousHosts->setCurrentIndex(index);
                 }
-            } else if (saveName.compare("Rooster Ranges") == 0) {
+            } else if (saveName.compare(previousHostName) == 0) {
                 previousHosts->setCurrentIndex(index);
             }
 
diff --git a/cockatrice/src/settings/serverssettings.cpp b/cockatrice/src/settings/serverssettings.cpp
index a4d831b3..6e9e4699 100644
--- a/cockatrice/src/settings/serverssettings.cpp
+++ b/cockatrice/src/settings/serverssettings.cpp
@@ -50,7 +50,8 @@ QString ServersSettings::getSite(QString defaultSite)
 
 QString ServersSettings::getPrevioushostName()
 {
-    return getValue("previoushostName", "server").toString();
+    QVariant value = getValue("previoushostName", "server");
+    return value == QVariant() ? "Rooster Ranges" : value.toString();
 }
 
 int ServersSettings::getPrevioushostindex(const QString &saveName)