X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=8e11a291570ffae9e686fd50e3cde66b3ff73606;hp=db0860c3a117fc559e64fa1575e7ca67c41adf6d;hb=d5213ee34d58ffeeeb99d750d58034ee31c1e9ae;hpb=8cc811b1baf648b85fc90a8d7ecf98259f9976ba

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index db0860c3..8e11a291 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -684,7 +684,7 @@ void MainWin::closeEvent(QCloseEvent *event) {
   QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
   Q_ASSERT(app);
   if(!app->aboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
-    hideToTray();
+    toggleMinimizedToTray();
     event->ignore();
   } else {
     event->accept();
@@ -712,11 +712,11 @@ void MainWin::hideToTray() {
 void MainWin::toggleMinimizedToTray() {
   if(windowState() & Qt::WindowMinimized) {
     // restore
-    setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+    setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
     show();
     raise();
   } else {
-    setWindowState(windowState() & ~Qt::WindowActive | Qt::WindowMinimized);
+    setWindowState((windowState() & ~Qt::WindowActive) | Qt::WindowMinimized);
     hideToTray();
   }
 }