lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 14:55:43 +02:00
Code Activity

calladapter: avoid the crash when receiving a call for rendezvous account

Browse source 
Gitlab: #189
Gitlab: #190
Change-Id: I7a5358c545b2362677091e167810d80553c60c27
This commit is contained in:
Ming Rui Zhang 2020-11-04 15:54:17 -05:00
parent 740cb407f8
commit 087d234836
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/calladapter.cpp
View file

@ -31,7 +31,8 @@ CallAdapter::CallAdapter(QObject* parent)
: QmlAdapterBase(parent) : QmlAdapterBase(parent)
, oneSecondTimer_(new QTimer(this)) , oneSecondTimer_(new QTimer(this))
{ {
connectCallModel(LRCInstance::getCurrAccId()); accountId_ = LRCInstance::getCurrAccId();
connectCallModel(accountId_);
connect(&LRCInstance::behaviorController(), connect(&LRCInstance::behaviorController(),
&BehaviorController::showIncomingCallView, &BehaviorController::showIncomingCallView,
@ -50,7 +51,8 @@ CallAdapter::CallAdapter(QObject* parent)
void void
CallAdapter::slotAccountChanged() CallAdapter::slotAccountChanged()
{ {
connectCallModel(LRCInstance::getCurrAccId()); accountId_ = LRCInstance::getCurrAccId();
connectCallModel(accountId_);
} }
void void
@ -431,7 +433,7 @@ CallAdapter::connectCallModel(const QString& accountId)
accInfo.conversationModel->selectConversation(convInfo.uid); accInfo.conversationModel->selectConversation(convInfo.uid);
} }
LRCInstance::renderer()->addDistantRenderer(callId); LRCInstance::renderer()->addDistantRenderer(callId);
updateCall(); updateCall(convInfo.uid, accountId);
LRCInstance::getAccountInfo(accountId).callModel->setCurrentCall(callId); LRCInstance::getAccountInfo(accountId).callModel->setCurrentCall(callId);
break; break;
} }