SYNERGY-334 The system asks to save twice. (#6814)
* SYNERGY-334 The system asks to save twice. * SYNERGY-334 ChangeLog has been updated.
This commit is contained in:
parent
4f65578546
commit
4ecac36e2f
3 changed files with 1 additions and 10 deletions
|
|
@ -10,7 +10,7 @@ Bug fixes:
|
||||||
- #6771 Added Ubuntu 16 to CI/CD
|
- #6771 Added Ubuntu 16 to CI/CD
|
||||||
- #6804 Synergy loses edition when creating a System scope config
|
- #6804 Synergy loses edition when creating a System scope config
|
||||||
- #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg
|
- #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg
|
||||||
|
- #6814 The system asks to save twice.
|
||||||
|
|
||||||
Enhancements:
|
Enhancements:
|
||||||
- #6750 Integrate SonarCloud for static analysis and test coverage
|
- #6750 Integrate SonarCloud for static analysis and test coverage
|
||||||
|
|
|
||||||
|
|
@ -224,8 +224,6 @@ MainWindow::~MainWindow()
|
||||||
delete m_pZeroconf;
|
delete m_pZeroconf;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
saveSettings();
|
|
||||||
|
|
||||||
delete m_pSslCertificate;
|
delete m_pSslCertificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1426,9 +1424,3 @@ void MainWindow::windowStateChanged()
|
||||||
if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray())
|
if (windowState() == Qt::WindowMinimized && appConfig().getMinimizeToTray())
|
||||||
hide();
|
hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::closeEvent(QCloseEvent *event) {
|
|
||||||
//If the main window is closing, trigger a save
|
|
||||||
GUI::Config::ConfigWriter::make()->globalSave();
|
|
||||||
event->accept();
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,6 @@ public slots:
|
||||||
void stopDesktop();
|
void stopDesktop();
|
||||||
void changeEvent(QEvent* event);
|
void changeEvent(QEvent* event);
|
||||||
void retranslateMenuBar();
|
void retranslateMenuBar();
|
||||||
void closeEvent(QCloseEvent *event) override;
|
|
||||||
|
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
bool isServiceRunning(QString name);
|
bool isServiceRunning(QString name);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue