From b13e88b5239bc61ddea60bd520346a8d4acca25c Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 7 Mar 2023 10:44:17 +0100 Subject: [PATCH] Crash on chat rooms with the default account. --- CHANGELOG.md | 7 ++++- .../conferenceInfo/ConferenceInfoModel.cpp | 26 ++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3903a835..06949d8c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - File viewer in chats (Image/Animated Image/Video/Texts) with the option to export the file. - Accept/decline CLI commands. +## 5.0.13 - undefined + +### Fixed +- Crash on chat rooms with default account. + ## 5.0.12 - 2023-03-01 -## Fixed +### Fixed - Some case of unwanted settings folders creation. - Replace black thumbnails that contains transparency by white color. - Unusable Contact sheet. diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp index 1e9f61142..31bd46a09 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp @@ -87,11 +87,14 @@ ConferenceInfoModel::ConferenceInfoModel (QObject * parent) : QObject(parent){ mConferenceInfo->setDateTime(0); mConferenceInfo->setDuration(0); mIsScheduled = false; - auto accountAddress = CoreManager::getInstance()->getCore()->getDefaultAccount()->getContactAddress(); - if(accountAddress){ - auto cleanedClonedAddress = accountAddress->clone(); - cleanedClonedAddress->clean(); - mConferenceInfo->setOrganizer(cleanedClonedAddress); + auto defaultAccount = CoreManager::getInstance()->getCore()->getDefaultAccount(); + if(defaultAccount){ + auto accountAddress = defaultAccount->getContactAddress(); + if(accountAddress){ + auto cleanedClonedAddress = accountAddress->clone(); + cleanedClonedAddress->clean(); + mConferenceInfo->setOrganizer(cleanedClonedAddress); + } } connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::timeZoneModelChanged); connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::dateTimeChanged); @@ -324,11 +327,14 @@ void ConferenceInfoModel::resetConferenceInfo() { mConferenceInfo->setDateTime(0); mConferenceInfo->setDuration(0); mIsScheduled = false; - auto accountAddress = CoreManager::getInstance()->getCore()->getDefaultAccount()->getContactAddress(); - if(accountAddress){ - auto cleanedClonedAddress = accountAddress->clone(); - cleanedClonedAddress->clean(); - mConferenceInfo->setOrganizer(cleanedClonedAddress); + auto defaultAccount = CoreManager::getInstance()->getCore()->getDefaultAccount(); + if(defaultAccount){ + auto accountAddress = defaultAccount->getContactAddress(); + if(accountAddress){ + auto cleanedClonedAddress = accountAddress->clone(); + cleanedClonedAddress->clean(); + mConferenceInfo->setOrganizer(cleanedClonedAddress); + } } }