From b15a04b00a7e43301ce39fad58713920113efed0 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Sun, 4 Mar 2018 13:40:30 +0200
Subject: Don't open room switcher when another dialog is open

fixes #251
---
 src/UserInfoWidget.cc | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'src/UserInfoWidget.cc')

diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc
index 273a6091..0a00b4cd 100644
--- a/src/UserInfoWidget.cc
+++ b/src/UserInfoWidget.cc
@@ -28,8 +28,6 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
   : QWidget(parent)
   , display_name_("User")
   , user_id_("@user:homeserver.org")
-  , logoutModal_{nullptr}
-  , logoutDialog_{nullptr}
   , logoutButtonSize_{20}
 {
         setFixedHeight(65);
@@ -91,33 +89,10 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
 
         // Show the confirmation dialog.
         connect(logoutButton_, &QPushButton::clicked, this, [this]() {
-                if (logoutDialog_.isNull()) {
-                        logoutDialog_ = QSharedPointer<dialogs::Logout>(new dialogs::Logout(this));
-                        connect(logoutDialog_.data(),
-                                SIGNAL(closing(bool)),
-                                this,
-                                SLOT(closeLogoutDialog(bool)));
-                }
-
-                if (logoutModal_.isNull()) {
-                        logoutModal_ = QSharedPointer<OverlayModal>(
-                          new OverlayModal(MainWindow::instance(), logoutDialog_.data()));
-                        logoutModal_->setColor(QColor(30, 30, 30, 170));
-                }
-
-                logoutModal_->show();
+                MainWindow::instance()->openLogoutDialog([this]() { emit logout(); });
         });
 }
 
-void
-UserInfoWidget::closeLogoutDialog(bool isLoggingOut)
-{
-        logoutModal_->hide();
-
-        if (isLoggingOut)
-                emit logout();
-}
-
 void
 UserInfoWidget::resizeEvent(QResizeEvent *event)
 {
-- 
cgit 1.5.1