From e303ee1fc9b11c53537f33c04c1350d8b279d35e Mon Sep 17 00:00:00 2001 From: miruka Date: Wed, 19 Aug 2020 09:45:22 -0400 Subject: [PATCH] SignInSso: return to server list on Cancel click --- TODO.md | 1 - src/gui/Pages/AddAccount/SignInSso.qml | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/TODO.md b/TODO.md index 3b9851d9..3ef13f2c 100644 --- a/TODO.md +++ b/TODO.md @@ -1,7 +1,6 @@ # TODO - server list sorting method / explain what the % number is (stability) -- clicking cancel on SSO "waiting" box doesn't do anything the first time - spam alt+shift+a when starting app on server browser → segfault - remove items.Device - register tab for sso servers? diff --git a/src/gui/Pages/AddAccount/SignInSso.qml b/src/gui/Pages/AddAccount/SignInSso.qml index 46718e2d..cb98fde9 100644 --- a/src/gui/Pages/AddAccount/SignInSso.qml +++ b/src/gui/Pages/AddAccount/SignInSso.qml @@ -26,6 +26,15 @@ SignInBase { }) } + function cancel() { + if (loginFuture) { + page.loginFuture.cancel() + page.loginFuture = null + } + + page.exitRequested() + } + applyButton.text: qsTr("Waiting") applyButton.loading: true