#6523 The auto hide feature was hidden, so this restores it

This commit is contained in:
walker0643 2018-01-30 16:55:34 -05:00 committed by Jnewbon
parent dd2c14a0fd
commit 2626c2c4cf
2 changed files with 8 additions and 19 deletions

View File

@ -207,7 +207,9 @@ void MainWindow::open()
{ {
createTrayIcon(); createTrayIcon();
if (!autoHide()) { if (appConfig().getAutoHide()) {
hide();
} else {
showNormal(); showNormal();
} }
@ -539,24 +541,12 @@ void MainWindow::checkFingerprint(const QString& line)
void MainWindow::checkSecureSocket(const QString& line) void MainWindow::checkSecureSocket(const QString& line)
{ {
// obviously not very secure, since this can be tricked by injecting something // obviously not very secure, since this can be tricked by injecting something
// into the log. however, since we don't have IPC between core and GUI... patches welcome. // into the log. however, since we don't have IPC between core and GUI... patches welcome.
if (line.contains(tlsCheckString)) { if (line.contains(tlsCheckString)) {
secureSocket(true); secureSocket(true);
} }
} }
bool MainWindow::autoHide()
{
if ((appConfig().processMode() == Desktop) &&
appConfig().getAutoHide()) {
hide();
return true;
}
return false;
}
QString MainWindow::getTimeStamp() QString MainWindow::getTimeStamp()
{ {
QDateTime current = QDateTime::currentDateTime(); QDateTime current = QDateTime::currentDateTime();

View File

@ -196,7 +196,6 @@ public slots:
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE
void checkLicense(const QString& line); void checkLicense(const QString& line);
#endif #endif
bool autoHide();
QString getTimeStamp(); QString getTimeStamp();
void restartSynergy(); void restartSynergy();
void proofreadInfo(); void proofreadInfo();