Merge V1.13.1 (#6955)
* 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:
parent
f47ee011fa
commit
b7a5da9404
4 changed files with 13 additions and 11 deletions
|
|
@ -7,7 +7,7 @@ Enhancements:
|
|||
- #6954 Move language selection to advanced section
|
||||
===========
|
||||
|
||||
v1.13.1-snapshot
|
||||
v1.13.1-stable
|
||||
===========
|
||||
Bug fixes:
|
||||
- #6900 Remaining SonarCloud reported bug items
|
||||
|
|
@ -26,6 +26,7 @@ Bug fixes:
|
|||
- #6941 The application doesn't recognize old settings
|
||||
- #6945 Fix build for Raspberry Pi
|
||||
- #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
|
||||
|
||||
Enhancements:
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ jobs:
|
|||
|
||||
strategy:
|
||||
matrix:
|
||||
# ubuntu1604:
|
||||
# image: symless/synergy-core:ubuntu16.04
|
||||
# packager: deb
|
||||
# name: ubuntu16
|
||||
ubuntu1604:
|
||||
image: symless/synergy-core:ubuntu16.04
|
||||
packager: deb
|
||||
name: ubuntu16
|
||||
ubuntu1804:
|
||||
image: symless/synergy-core:ubuntu18.04
|
||||
packager: deb
|
||||
|
|
|
|||
|
|
@ -186,6 +186,10 @@ namespace GUI {
|
|||
for (auto &i : m_pCallerList) {
|
||||
i->saveSettings();
|
||||
}
|
||||
|
||||
m_pSettingsUser->sync();
|
||||
m_pSettingsSystem->sync();
|
||||
|
||||
m_unsavedChanges = false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -336,13 +336,8 @@ void MainWindow::saveSettings()
|
|||
appConfig().setConfigFile(m_pLineEditConfigFile->text());
|
||||
appConfig().setServerHostname(m_pLineEditHostname->text());
|
||||
|
||||
/* 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.
|
||||
*/
|
||||
/* Save everything */
|
||||
GUI::Config::ConfigWriter::make()->globalSave();
|
||||
GUI::Config::ConfigWriter::destroy();
|
||||
}
|
||||
|
||||
void MainWindow::zeroConfToggled() {
|
||||
|
|
@ -596,6 +591,8 @@ void MainWindow::clearLog()
|
|||
|
||||
void MainWindow::startSynergy()
|
||||
{
|
||||
saveSettings();
|
||||
|
||||
#ifndef SYNERGY_ENTERPRISE
|
||||
SerialKey serialKey = m_LicenseManager->serialKey();
|
||||
if (!serialKey.isValid()) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue