Don't dismiss the loading overlay by clicking

2 files changed, 2 insertions, 1 deletions

diff --git a/src/MainWindow.cc b/src/MainWindow.cc

index 228c900b..9437b401 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -213,6 +213,7 @@ MainWindow::showChatPage(QString userid, QString homeserver, QString token)
                 progressModal_ =
                   QSharedPointer<OverlayModal>(new OverlayModal(this, spinner_.data()),
                                                [=](OverlayModal *modal) { modal->deleteLater(); });
+                progressModal_->setDismissible(false);
                 progressModal_->fadeIn();
                 progressModal_->setDuration(modalOpacityDuration);
         }
diff --git a/src/ui/OverlayModal.cc b/src/ui/OverlayModal.cc

index 62d31f24..87703af8 100644
--- a/src/ui/OverlayModal.cc
+++ b/src/ui/OverlayModal.cc
@@ -64,7 +64,7 @@ OverlayModal::paintEvent(QPaintEvent *event)
 void
 OverlayModal::mousePressEvent(QMouseEvent *e)
 {
-        if (content_ && !content_->geometry().contains(e->pos()))
+        if (isDismissible_ && content_ && !content_->geometry().contains(e->pos()))
                 fadeOut();
 }