mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crash fix on ending a call.

Browse source
This commit is contained in:
Julien Wadel 2022-07-12 16:11:22 +02:00
parent 1b0b92fbc3
commit a51086c06a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linphone-app/src/components/call/CallModel.cpp
View file

@ -119,7 +119,10 @@ CallModel::~CallModel () {
mMagicSearch->removeListener(mSearch);
if(mCall){
mCall->removeListener(mCallListener);
mConferenceModel = nullptr;// Ordering deletion.
mConferenceInfoModel = nullptr;
mCall->unsetData("call-model");
mCall = nullptr;
}
}
@ -217,7 +220,8 @@ QSharedPointer<ConferenceModel> CallModel::getConferenceSharedModel(){
}
bool CallModel::isConference () const{
return mCall->getConference() != nullptr;
// Check status to avoid crash when requesting a conference on an ended call.
return getStatus() != CallStatusEnded && mCall->getConference() != nullptr;
}
// -----------------------------------------------------------------------------

2
linphone-app/ui/views/App/Calls/VideoConferenceFullscreen.qml
View file

@ -300,8 +300,6 @@ Window {
? conference.callModel.conferenceVideoLayout == LinphoneEnums.ConferenceLayoutGrid || !conference.callModel.videoEnabled? gridComponent : activeSpeakerComponent
: activeSpeakerComponent
: null
onSourceComponentChanged: console.log(conference.callModel.conferenceVideoLayout)
active: conference.callModel
ColumnLayout {
anchors.fill: parent