Merge pull request qTox#3687

Vincas Dargis (1): fix(widget): do not block logout on Linux desktop environments
Talkless · Sep 6, 2016 · 191fc15 · 191fc15
2 parents c6a52b1 + 7ee883b
commit 191fc15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
@@ -568,12 +568,11 @@ void Widget::moveEvent(QMoveEvent *event)
     QWidget::moveEvent(event);
 }
 
-void Widget::closeEvent(QCloseEvent *event)
+void Widget::hideEvent(QHideEvent *event)
 {
     if (Settings::getInstance().getShowSystemTray() && Settings::getInstance().getCloseToTray())
     {
-        event->ignore();
-        this->hide();
+        QWidget::hideEvent(event);
     }
     else
     {
@@ -584,7 +583,7 @@ void Widget::closeEvent(QCloseEvent *event)
         }
         saveWindowGeometry();
         saveSplitterGeometry();
-        QWidget::closeEvent(event);
+        QWidget::hideEvent(event);
         qApp->quit();
     }
 }

diff --git a/src/widget/widget.h b/src/widget/widget.h
@@ -161,7 +161,7 @@ public slots:
 protected:
     virtual bool eventFilter(QObject *obj, QEvent *event) final override;
     virtual bool event(QEvent * e) final override;
-    virtual void closeEvent(QCloseEvent *event) final override;
+    virtual void hideEvent(QHideEvent *event) final override;
     virtual void changeEvent(QEvent *event) final override;
     virtual void resizeEvent(QResizeEvent *event) final override;
     virtual void moveEvent(QMoveEvent *event) final override;