smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge V1.13.1 (#6955)

Browse source 
* Release 1.13.1-rc1

* Enable ubuntu 16 build

* SYNERGY-832 Synergy client doesn't save the server address when rebooted (#6950)

* Update ChangeLog

* Fix issue creating standard version for Raspberry Pi

* SYNERGY-843 Update version

* Update Version.cmake to merge into master
This commit is contained in:
SerhiiGadzhilov 2021-03-01 16:23:27 +03:00 committed by GitHub
parent f47ee011fa
commit b7a5da9404
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -7,7 +7,7 @@ Enhancements:
- #6954 Move language selection to advanced section - #6954 Move language selection to advanced section
=========== ===========
v1.13.1-snapshot v1.13.1-stable
=========== ===========
Bug fixes: Bug fixes:
- #6900 Remaining SonarCloud reported bug items - #6900 Remaining SonarCloud reported bug items
@ -26,6 +26,7 @@ Bug fixes:
- #6941 The application doesn't recognize old settings - #6941 The application doesn't recognize old settings
- #6945 Fix build for Raspberry Pi - #6945 Fix build for Raspberry Pi
- #6946 Add build stage to filename - #6946 Add build stage to filename
- #6950 Synergy client doesn't save the server address when rebooted
- #6951 Fix issue creating standard version for Raspberry Pi - #6951 Fix issue creating standard version for Raspberry Pi
Enhancements: Enhancements:

8
azure-pipelines.yml
View file

@ -10,10 +10,10 @@ jobs:
strategy: strategy:
matrix: matrix:
# ubuntu1604: ubuntu1604:
# image: symless/synergy-core:ubuntu16.04 image: symless/synergy-core:ubuntu16.04
# packager: deb packager: deb
# name: ubuntu16 name: ubuntu16
ubuntu1804: ubuntu1804:
image: symless/synergy-core:ubuntu18.04 image: symless/synergy-core:ubuntu18.04
packager: deb packager: deb

4
src/gui/src/ConfigWriter.cpp
View file

@ -186,6 +186,10 @@ namespace GUI {
for (auto &i : m_pCallerList) { for (auto &i : m_pCallerList) {
i->saveSettings(); i->saveSettings();
} }
m_pSettingsUser->sync();
m_pSettingsSystem->sync();
m_unsavedChanges = false; m_unsavedChanges = false;
} }
} }

9
src/gui/src/MainWindow.cpp
View file

@ -336,13 +336,8 @@ void MainWindow::saveSettings()
appConfig().setConfigFile(m_pLineEditConfigFile->text()); appConfig().setConfigFile(m_pLineEditConfigFile->text());
appConfig().setServerHostname(m_pLineEditHostname->text()); appConfig().setServerHostname(m_pLineEditHostname->text());
/* Save everything /* Save everything */
* ConfigWriter is a singlethon hence we should call destroy
* During destroy the ConfigWriter destroys QSetting which saves all settings to file.
* Before destroy all settings are stored only in memmory.
*/
GUI::Config::ConfigWriter::make()->globalSave(); GUI::Config::ConfigWriter::make()->globalSave();
GUI::Config::ConfigWriter::destroy();
} }
void MainWindow::zeroConfToggled() { void MainWindow::zeroConfToggled() {
@ -596,6 +591,8 @@ void MainWindow::clearLog()
void MainWindow::startSynergy() void MainWindow::startSynergy()
{ {
saveSettings();
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE
SerialKey serialKey = m_LicenseManager->serialKey(); SerialKey serialKey = m_LicenseManager->serialKey();
if (!serialKey.isValid()) { if (!serialKey.isValid()) {