From a767690f951c99b21b79d6243fb1cf9dfab2dd6e Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Tue, 6 Apr 2021 17:02:18 -0400
Subject: [PATCH] misc: crash fix for calladapter when there is no account
Change-Id: I6432c6ebb7776bb0968846c661bd98ed78cde2bb
---
src/calladapter.cpp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/calladapter.cpp b/src/calladapter.cpp
index 02a399c79..96e895675 100644
--- a/src/calladapter.cpp
+++ b/src/calladapter.cpp
@@ -35,7 +35,8 @@ CallAdapter::CallAdapter(SystemTray* systemTray, LRCInstance* instance, QObject*
, systemTray_(systemTray)
{
accountId_ = lrcInstance_->getCurrAccId();
- connectCallModel(accountId_);
+ if (!accountId_.isEmpty())
+ connectCallModel(accountId_);
connect(&lrcInstance_->behaviorController(),
&BehaviorController::showIncomingCallView,
@@ -518,13 +519,13 @@ CallAdapter::updateCallOverlay(const lrc::api::conversation::Info& convInfo)
: accInfo.contactModel->bestNameForContact(convInfo.participants[0]);
Q_EMIT updateOverlay(isPaused,
- isAudioOnly,
- isAudioMuted,
- isVideoMuted,
- isRecording,
- accInfo.profileInfo.type == lrc::api::profile::Type::SIP,
- !convInfo.confId.isEmpty(),
- bestName);
+ isAudioOnly,
+ isAudioMuted,
+ isVideoMuted,
+ isRecording,
+ accInfo.profileInfo.type == lrc::api::profile::Type::SIP,
+ !convInfo.confId.isEmpty(),
+ bestName);
}
void
--
GitLab