From edaebf904255fbbfa0240819f457ffa90b96db85 Mon Sep 17 00:00:00 2001 From: "gaelle.braud" Date: Mon, 17 Feb 2025 15:31:05 +0100 Subject: [PATCH] revert --- Linphone/core/account/AccountList.cpp | 2 +- Linphone/view/Page/Window/Main/MainWindow.qml | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Linphone/core/account/AccountList.cpp b/Linphone/core/account/AccountList.cpp index 374cc5656..48c19f33d 100644 --- a/Linphone/core/account/AccountList.cpp +++ b/Linphone/core/account/AccountList.cpp @@ -83,7 +83,7 @@ void AccountList::setSelf(QSharedPointer me) { } else mModelConnection->invokeToCore([this]() { setDefaultAccount(nullptr); }); }); mModelConnection->makeConnectToModel(&CoreModel::accountRemoved, [this] { emit lUpdate(); }); - mModelConnection->makeConnectToModel(&CoreModel::accountAdded, [this] { emit lUpdate(); }); + mModelConnection->makeConnectToModel(&CoreModel::accountAdded, [this] { emit lUpdate(true); }); mModelConnection->makeConnectToModel( &CoreModel::globalStateChanged, diff --git a/Linphone/view/Page/Window/Main/MainWindow.qml b/Linphone/view/Page/Window/Main/MainWindow.qml index 0541f8e77..79059ad1b 100644 --- a/Linphone/view/Page/Window/Main/MainWindow.qml +++ b/Linphone/view/Page/Window/Main/MainWindow.qml @@ -123,10 +123,6 @@ AbstractWindow { id: mainWindowStackView anchors.fill: parent initialItem: splashScreen - Component.onCompleted: { - clear() - push(splashScreen) - } } Component { id: splashScreen @@ -158,7 +154,8 @@ AbstractWindow { onGoBack: openMainPage() onUseSIPButtonClicked: mainWindowStackView.push(sipLoginPage) onGoToRegister: mainWindowStackView.replace(registerPage) - showBackButton: mainWindow.accountProxy?.haveAccount || false + showBackButton: false + StackView.onActivated: if (mainWindow.accountProxy?.haveAccount) showBackButton = true } } Component { @@ -172,7 +169,8 @@ AbstractWindow { mainWindowStackView.pop() } onGoToRegister: mainWindowStackView.replace(registerPage) - showBackButton: !SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin || mainWindow.accountProxy?.haveAccount + showBackButton: false + StackView.onActivated: if (!SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin || mainWindow.accountProxy?.haveAccount) showBackButton = true } } Component {