From 4a5b9d014a7659223b3a820723b13f834b922c4f Mon Sep 17 00:00:00 2001 From: Jedi18 Date: Thu, 25 Feb 2021 18:10:06 +0530 Subject: change mtxclient url, fix login page assert failure and dendrite registration bug --- src/LoginPage.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/LoginPage.cpp') diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 26a170c5..cd54431d 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -192,6 +192,11 @@ LoginPage::LoginPage(QWidget *parent) connect(sso_login_button_, &RaisedButton::clicked, this, [this]() { onLoginButtonClicked(LoginMethod::SSO); }); + connect(this, + &LoginPage::showErrorMessage, + this, + static_cast(&LoginPage::showError), + Qt::QueuedConnection); connect(matrixid_input_, SIGNAL(returnPressed()), login_button_, SLOT(click())); connect(password_input_, SIGNAL(returnPressed()), login_button_, SLOT(click())); connect(deviceName_, SIGNAL(returnPressed()), login_button_, SLOT(click())); @@ -422,8 +427,8 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod) : deviceName_->text().toStdString(), [this](const mtx::responses::Login &res, mtx::http::RequestErr err) { if (err) { - showError(error_label_, - QString::fromStdString(err->matrix_error.error)); + showErrorMessage(error_label_, + QString::fromStdString(err->matrix_error.error)); emit errorOccurred(); return; } @@ -448,7 +453,7 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod) http::client()->login( req, [this](const mtx::responses::Login &res, mtx::http::RequestErr err) { if (err) { - showError( + showErrorMessage( error_label_, QString::fromStdString(err->matrix_error.error)); emit errorOccurred(); @@ -467,7 +472,7 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod) sso->deleteLater(); }); connect(sso, &SSOHandler::ssoFailed, this, [this, sso]() { - showError(error_label_, tr("SSO login failed")); + showErrorMessage(error_label_, tr("SSO login failed")); emit errorOccurred(); sso->deleteLater(); }); -- cgit 1.5.1