From 37d8b626208ab51fc6bcf6e284cc7c0c1faad6ec Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <serhii-external@symless.com>
Date: Wed, 7 Oct 2020 10:54:34 +0300
Subject: [PATCH 1/2] SYNERGY-322Synergy loses edition when creating a System
 scope config

---
 src/gui/src/AppConfig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index f62afe0dff..d1040270c8 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -234,7 +234,6 @@ void AppConfig::loadSettings()
         m_ElevateMode        = static_cast<ElevateMode>(elevateMode.toInt());
     }
 
-    m_Edition                   = static_cast<Edition>(loadSetting(kEditionSetting, kUnregistered).toInt());
     m_ActivateEmail             = loadSetting(kActivateEmail, "").toString();
     m_CryptoEnabled             = loadSetting(kCryptoEnabled, true).toBool();
     m_AutoHide                  = loadSetting(kAutoHide, false).toBool();
@@ -258,6 +257,7 @@ void AppConfig::loadSettings()
 
     if (updateSerial) {
         m_Serialkey                 = loadSetting(kSerialKey, "").toString().trimmed();
+        m_Edition                   = static_cast<Edition>(loadSetting(kEditionSetting, kUnregistered).toInt());
     }
 
     //Set the default path of the TLS certificate file in the users DIR

From 5dadb6032d9bbb17ccce08ae345cc59914d24433 Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <serhii-external@symless.com>
Date: Wed, 7 Oct 2020 10:57:19 +0300
Subject: [PATCH 2/2] SYNERGY-322 Update ChangeLog

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index a0978ce24f..3e5c1a2979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ Bug fixes:
 - #6760 Synergy loses license when creating a System scope config
 - #6342 Updated copyright year in version to use build date
 - #6771 Added Ubuntu 16 to CI/CD
+- #6804 Synergy loses edition when creating a System scope config
 
 
 Enhancements: