Merge pull request #398 from Jedi18/master

Fix assert failure due to calling versionOk on a different thread

1 files changed, 4 insertions, 3 deletions

diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp

index dba5ba51..ec9b856f 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp
@@ -174,8 +174,9 @@ LoginPage::LoginPage(QWidget *parent)
 
         setLayout(top_layout_);
 
-        connect(this, &LoginPage::versionOkCb, this, &LoginPage::versionOk);
-        connect(this, &LoginPage::versionErrorCb, this, &LoginPage::versionError);
+        connect(this, &LoginPage::versionOkCb, this, &LoginPage::versionOk, Qt::QueuedConnection);
+        connect(
+          this, &LoginPage::versionErrorCb, this, &LoginPage::versionError, Qt::QueuedConnection);
 
         connect(back_button_, SIGNAL(clicked()), this, SLOT(onBackButtonClicked()));
         connect(login_button_, SIGNAL(clicked()), this, SLOT(onLoginButtonClicked()));
@@ -322,7 +323,7 @@ LoginPage::checkHomeserverVersion()
                                             break;
                                     }
                             }
-                            emit versionOk(loginMethod_);
+                            emit versionOkCb(loginMethod_);
                     });
           });
 }