Merge master and fix conflicts

1 files changed, 8 insertions, 4 deletions

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

index 05741cca..dba5ba51 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp
@@ -315,10 +315,14 @@ LoginPage::checkHomeserverVersion()
                             if (err || flows.flows.empty())
                                     emit versionOkCb(LoginMethod::Password);
 
-                            if (flows.flows[0].type == mtx::user_interactive::auth_types::sso)
-                                    emit versionOkCb(LoginMethod::SSO);
-                            else
-                                    emit versionOkCb(LoginMethod::Password);
+                            LoginMethod loginMethod_ = LoginMethod::Password;
+                            for (const auto &flow : flows.flows) {
+                                    if (flow.type == mtx::user_interactive::auth_types::sso) {
+                                            loginMethod_ = LoginMethod::SSO;
+                                            break;
+                                    }
+                            }
+                            emit versionOk(loginMethod_);
                     });
           });
 }