From f50d2065e4e2a78d45dd1332770a50abf3744dc2 Mon Sep 17 00:00:00 2001
From: Jamie Newbon <jamie@symless.com>
Date: Mon, 27 Apr 2020 13:03:42 +0100
Subject: [PATCH] #6538 Updated AppConfig constructor, and removed some save
 settings calls

---
 src/gui/src/MainWindow.cpp | 7 ++-----
 src/gui/src/MainWindow.h   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 50b1ffcb2e..d342c3850f 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -97,7 +97,7 @@ static const char* synergyDefaultIconFiles[] =
 };
 
 #ifdef SYNERGY_ENTERPRISE
-MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig)
+MainWindow::MainWindow (AppConfig& appConfig)
 #else
 MainWindow::MainWindow (AppConfig& appConfig,
                         LicenseManager& licenseManager)
@@ -111,7 +111,7 @@ MainWindow::MainWindow (AppConfig& appConfig,
     m_AppConfig(&appConfig),
     m_pSynergy(NULL),
     m_SynergyState(synergyDisconnected),
-    m_ServerConfig(m_AppConfig, 5, 3, m_AppConfig->screenName(), this),
+    m_ServerConfig(5, 3, m_AppConfig->screenName(), this),
     m_pTempConfigFile(NULL),
     m_pTrayIcon(NULL),
     m_pTrayIconMenu(NULL),
@@ -195,7 +195,6 @@ MainWindow::MainWindow (AppConfig& appConfig,
     QString currentVersion = m_VersionChecker.getVersion();
     if (lastVersion != currentVersion) {
         m_AppConfig->setLastVersion (currentVersion);
-        m_AppConfig->saveSettings();
 #ifndef SYNERGY_ENTERPRISE
         m_LicenseManager->notifyUpdate (lastVersion, currentVersion);
 #endif
@@ -497,7 +496,6 @@ void MainWindow::checkConnected(const QString& line)
                     "the background."));
 
             appConfig().setStartedBefore(true);
-            appConfig().saveSettings();
         }
     }
     else if (line.contains("started server"))
@@ -1460,7 +1458,6 @@ void MainWindow::on_m_pLabelAutoConfig_linkActivated(const QString &)
 void MainWindow::on_m_pComboServerList_currentIndexChanged(const QString &server)
 {
     appConfig().setAutoConfigServer(server);
-    appConfig().saveSettings();
 }
 
 void MainWindow::windowStateChanged()
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 6b34253cb8..083d2219f9 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -96,7 +96,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
 
     public:
 #ifdef SYNERGY_ENTERPRISE
-        MainWindow(QSettings& settings, AppConfig& appConfig);
+        MainWindow(AppConfig& appConfig);
 #else
         MainWindow(AppConfig& appConfig,
                    LicenseManager& licenseManager);