diff --git a/engine b/engine index 49ea9f86990bb61d2e60350cc499199da5c91cab..ae67df7f380b389b35f33640399da4e6b16a27c0 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 49ea9f86990bb61d2e60350cc499199da5c91cab +Subproject commit ae67df7f380b389b35f33640399da4e6b16a27c0 diff --git a/fairchat/qml/pages/LoginPage.qml b/fairchat/qml/pages/LoginPage.qml index 01e03866bcd16d48e72d1eab9babfe31550a8967..aea774a780f08864fbe2b7902885564f5c3e09b6 100755 --- a/fairchat/qml/pages/LoginPage.qml +++ b/fairchat/qml/pages/LoginPage.qml @@ -251,7 +251,7 @@ Page { mainStack.toMainView() } onHashLoggedIn: { - welcomePopup.open() + // welcomePopup.open() } onLoginError: { diff --git a/fairchat/qml/pages/OpenIDLogin.qml b/fairchat/qml/pages/OpenIDLogin.qml index d017e06029b762963f9e6a24d1d821bdbc7d972a..9cc4a56f032ea4d26d1df9872ad3a4483fe01834 100644 --- a/fairchat/qml/pages/OpenIDLogin.qml +++ b/fairchat/qml/pages/OpenIDLogin.qml @@ -96,7 +96,7 @@ Page { if(idpWebView.loadProgress == 100){ idpWebView.runJavaScript("document.getElementById(\"config\").textContent",function(result){ rocketChatController.loginWithMethod(loginMethod, result) - + mainStack.pop() }) }else{ timer.start()