From 35d90ceb78e3b0924ae81de201a242fb4c754544 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 24 Oct 2022 11:10:57 +0200 Subject: [PATCH] Fix LDAP crash and stuck assistant. --- .../src/components/settings/AccountSettingsModel.cpp | 6 +++++- linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp index e0b73b2a0..44d1a447e 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp @@ -507,7 +507,11 @@ QString AccountSettingsModel::getPrimarySipAddress () const { } QString AccountSettingsModel::getDefaultAccountDomain() const{ - return Utils::coreStringToAppString(CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getDomain()); + auto account = CoreManager::getInstance()->getCore()->getDefaultAccount(); + if(account) + return Utils::coreStringToAppString(account->getParams()->getDomain()); + else + return ""; } // ----------------------------------------------------------------------------- diff --git a/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml b/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml index 759e3be1c..1352c6693 100644 --- a/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml +++ b/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml @@ -138,12 +138,14 @@ ColumnLayout { append({ $text: qsTr('useOtherSipAccount'), $view: 'UseOtherSipAccount', - $viewType: 'UseOtherSipAccount' + $viewType: 'UseOtherSipAccount', + $props: {} }) append( { $text: qsTr('fetchRemoteConfiguration'), $view: 'FetchRemoteConfiguration', - $viewType: 'FetchRemoteConfiguration' + $viewType: 'FetchRemoteConfiguration', + $props: {} }) } }