From 8aefe3d8003f07fb0b6526fc299fee5104817888 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 1 Oct 2024 10:27:00 +0200 Subject: [PATCH] Display back button in login with 'assistant_go_directly_to_third_party_sip_account_login' option. --- Linphone/view/Page/Form/Login/SIPLoginPage.qml | 1 - Linphone/view/Page/Window/Main/MainWindow.qml | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Linphone/view/Page/Form/Login/SIPLoginPage.qml b/Linphone/view/Page/Form/Login/SIPLoginPage.qml index 3debec320..4d2671e34 100644 --- a/Linphone/view/Page/Form/Login/SIPLoginPage.qml +++ b/Linphone/view/Page/Form/Login/SIPLoginPage.qml @@ -31,7 +31,6 @@ LoginLayout { console.debug("[SIPLoginPage] User: return") mainItem.goBack() } - visible: !SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin } Image { fillMode: Image.PreserveAspectFit diff --git a/Linphone/view/Page/Window/Main/MainWindow.qml b/Linphone/view/Page/Window/Main/MainWindow.qml index cc9c470b8..53df69f90 100644 --- a/Linphone/view/Page/Window/Main/MainWindow.qml +++ b/Linphone/view/Page/Window/Main/MainWindow.qml @@ -134,7 +134,12 @@ AbstractWindow { Component { id: sipLoginPage SIPLoginPage { - onGoBack: mainWindowStackView.pop() + onGoBack: { + if(SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin) + mainWindowStackView.replace(mainPage) + else + mainWindowStackView.pop() + } onGoToRegister: mainWindowStackView.replace(registerPage) onConnectionSucceed: {