From 087d2348365c3ecd2233404848379ac017bfca6d Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 4 Nov 2020 15:54:17 -0500
Subject: [PATCH] calladapter: avoid the crash when receiving a call for
rendezvous account
Gitlab: #189
Gitlab: #190
Change-Id: I7a5358c545b2362677091e167810d80553c60c27
---
src/calladapter.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/calladapter.cpp b/src/calladapter.cpp
index b2c1d29c3..ed1f2405c 100644
--- a/src/calladapter.cpp
+++ b/src/calladapter.cpp
@@ -31,7 +31,8 @@ CallAdapter::CallAdapter(QObject* parent)
: QmlAdapterBase(parent)
, oneSecondTimer_(new QTimer(this))
{
- connectCallModel(LRCInstance::getCurrAccId());
+ accountId_ = LRCInstance::getCurrAccId();
+ connectCallModel(accountId_);
connect(&LRCInstance::behaviorController(),
&BehaviorController::showIncomingCallView,
@@ -50,7 +51,8 @@ CallAdapter::CallAdapter(QObject* parent)
void
CallAdapter::slotAccountChanged()
{
- connectCallModel(LRCInstance::getCurrAccId());
+ accountId_ = LRCInstance::getCurrAccId();
+ connectCallModel(accountId_);
}
void
@@ -431,7 +433,7 @@ CallAdapter::connectCallModel(const QString& accountId)
accInfo.conversationModel->selectConversation(convInfo.uid);
}
LRCInstance::renderer()->addDistantRenderer(callId);
- updateCall();
+ updateCall(convInfo.uid, accountId);
LRCInstance::getAccountInfo(accountId).callModel->setCurrentCall(callId);
break;
}
--
GitLab