1 files changed, 5 insertions, 1 deletions
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index 5c188903..fd44e405 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -94,6 +94,8 @@ MainWindow::MainWindow(QWidget *parent)
                 pageStack_->setCurrentWidget(chat_page_);
         });
 
+        connect(userSettingsPage_, SIGNAL(trayOptionChanged(bool)), trayIcon_, SLOT(setVisible(bool)));
+
         connect(trayIcon_,
                 SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
                 this,
@@ -113,6 +115,8 @@ MainWindow::MainWindow(QWidget *parent)
 
         QSettings settings;
 
+        trayIcon_->setVisible(userSettings_->isTrayEnabled());
+
         if (hasActiveUser()) {
                 QString token       = settings.value("auth/access_token").toString();
                 QString home_server = settings.value("auth/home_server").toString();
@@ -253,7 +257,7 @@ MainWindow::showUserSettingsPage()
 void
 MainWindow::closeEvent(QCloseEvent *event)
 {
-        if (isVisible()) {
+        if (isVisible() && userSettings_->isTrayEnabled()) {
                 event->ignore();
                 hide();
         }