CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-07-04 21:04:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6804 from symless/SYNERGY-322-Keep-edition-in-config-if-the-new-config-doesn't-have-it

Browse Source 
SYNERGY-322 Synergy loses edition when creating a System scope config
This commit is contained in:
Jnewbon 2020-10-15 16:25:44 +01:00 committed by GitHub
commit 59e9a1f41d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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
- #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg

2
src/gui/src/AppConfig.cpp
View File

@ -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