From 8f42422ee3db8a1360fbf55f4b371192f1567db2 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 22 Aug 2022 12:43:29 +0200 Subject: [PATCH] Fix a crash when starting the application without accounts. --- linphone-app/src/components/core/CoreManager.cpp | 4 ++-- linphone-app/src/components/settings/SettingsModel.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp index 887c6b64c..0f76659b8 100644 --- a/linphone-app/src/components/core/CoreManager.cpp +++ b/linphone-app/src/components/core/CoreManager.cpp @@ -92,13 +92,13 @@ CoreManager::~CoreManager(){ void CoreManager::initCoreManager(){ qInfo() << "Init CoreManager"; + mAccountSettingsModel = new AccountSettingsModel(this); + mSettingsModel = new SettingsModel(this); mCallsListModel = new CallsListModel(this); mChatModel = new ChatModel(this); mContactsListModel = new ContactsListModel(this); mContactsImporterListModel = new ContactsImporterListModel(this); - mAccountSettingsModel = new AccountSettingsModel(this); mLdapListModel = new LdapListModel(this); - mSettingsModel = new SettingsModel(this); mSipAddressesModel = new SipAddressesModel(this); mEventCountNotifier = new EventCountNotifier(this); mTimelineListModel = new TimelineListModel(this); diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index b7ad19438..4c79edead 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -832,7 +832,7 @@ void SettingsModel::setSecureChatEnabled (bool status) { } bool SettingsModel::getGroupChatEnabled() const{ - return !CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getConferenceFactoryUri().empty(); + return CoreManager::getInstance()->getCore()->getDefaultAccount() && !CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getConferenceFactoryUri().empty(); } // ----------------------------------------------------------------------------- @@ -872,7 +872,7 @@ void SettingsModel::setConferenceEnabled (bool status) { } bool SettingsModel::getVideoConferenceEnabled() const{ - return !!CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getAudioVideoConferenceFactoryAddress(); + return CoreManager::getInstance()->getCore()->getDefaultAccount() && !!CoreManager::getInstance()->getCore()->getDefaultAccount()->getParams()->getAudioVideoConferenceFactoryAddress(); } // -----------------------------------------------------------------------------