From b15a04b00a7e43301ce39fad58713920113efed0 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 4 Mar 2018 13:40:30 +0200 Subject: Don't open room switcher when another dialog is open fixes #251 --- src/TopRoomBar.cc | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'src/TopRoomBar.cc') diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc index d5f88044..c4ce3d7d 100644 --- a/src/TopRoomBar.cc +++ b/src/TopRoomBar.cc @@ -92,28 +92,8 @@ TopRoomBar::TopRoomBar(QWidget *parent) inviteUsers_ = new QAction(tr("Invite users"), this); connect(inviteUsers_, &QAction::triggered, this, [this]() { - if (inviteUsersDialog_.isNull()) { - inviteUsersDialog_ = - QSharedPointer(new dialogs::InviteUsers(this)); - - connect(inviteUsersDialog_.data(), - &dialogs::InviteUsers::closing, - this, - [this](bool isSending, QStringList invitees) { - inviteUsersModal_->hide(); - - if (isSending && !invitees.isEmpty()) - emit inviteUsers(invitees); - }); - } - - if (inviteUsersModal_.isNull()) { - inviteUsersModal_ = QSharedPointer( - new OverlayModal(MainWindow::instance(), inviteUsersDialog_.data())); - inviteUsersModal_->setColor(QColor(30, 30, 30, 170)); - } - - inviteUsersModal_->show(); + MainWindow::instance()->openInviteUsersDialog( + [this](const QStringList &invitees) { emit inviteUsers(invitees); }); }); leaveRoom_ = new QAction(tr("Leave room"), this); -- cgit 1.5.1