From 4fa644f2b7d0e95f8f917dc6d4d030153c0da73e Mon Sep 17 00:00:00 2001
From: Callum Brown <callum@calcuode.com>
Date: Thu, 12 Aug 2021 17:57:07 +0100
Subject: [PATCH] Fix cancel button on registration token dialog

---
 src/RegisterPage.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
index acee6f78..ddd4d47d 100644
--- a/src/RegisterPage.cpp
+++ b/src/RegisterPage.cpp
@@ -483,10 +483,21 @@ RegisterPage::doUIA(const mtx::user_interactive::Unauthorized &unauthorized)
                   mtx::user_interactive::Auth{session, mtx::user_interactive::auth::Dummy{}});
 
         } else if (current_stage == mtx::user_interactive::auth_types::registration_token) {
-                QString token = QInputDialog::getText(
-                  this, tr("Registration token"), tr("Please enter a valid registration token."));
-                emit registrationWithAuth(mtx::user_interactive::Auth{
-                  session, mtx::user_interactive::auth::RegistrationToken{token.toStdString()}});
+                bool ok;
+                QString token =
+                  QInputDialog::getText(this,
+                                        tr("Registration token"),
+                                        tr("Please enter a valid registration token."),
+                                        QLineEdit::Normal,
+                                        QString(),
+                                        &ok);
+
+		if (ok) {
+			emit registrationWithAuth(mtx::user_interactive::Auth{
+			  session, mtx::user_interactive::auth::RegistrationToken{token.toStdString()}});
+		} else {
+			emit errorOccurred();
+		}
         } else {
                 // use fallback
                 auto dialog = new dialogs::FallbackAuth(