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

Fix call crash

Browse source
This commit is contained in:
Julien Wadel 2023-01-13 16:50:18 +01:00
parent 165ef1a46a
commit e2cac1a4ac
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linphone-app/src/components/camera/Camera.cpp
View file

@ -159,7 +159,7 @@ void Camera::removeParticipantDeviceModel(){
mParticipantDeviceModel = nullptr;
}
void Camera::callRemoved(){
void Camera::removeCallModel(){
mCallModel = nullptr;
}
@ -229,11 +229,13 @@ ParticipantDeviceModel * Camera::getParticipantDeviceModel() const{
void Camera::setCallModel (CallModel *callModel) {
if (mCallModel != callModel) {
if( mCallModel)
if( mCallModel){
disconnect(mCallModel, &CallModel::statusChanged, this, &Camera::onCallStateChanged);
disconnect(mCallModel, &QObject::destroyed, this, &Camera::removeCallModel);
}
mCallModel = callModel;
connect(mCallModel, &CallModel::statusChanged, this, &Camera::onCallStateChanged);
connect(mCallModel, &QObject::destroyed, this, &Camera::callRemoved);
connect(mCallModel, &QObject::destroyed, this, &Camera::removeCallModel);
updateWindowIdLocation();
update();
@ -263,7 +265,7 @@ void Camera::setIsReady(bool status) {
}
void Camera::setParticipantDeviceModel(ParticipantDeviceModel * participantDeviceModel){
if (mParticipantDeviceModel != participantDeviceModel) {
if (mParticipantDeviceModel != participantDeviceModel) {
if( mParticipantDeviceModel)
disconnect(mParticipantDeviceModel, &QObject::destroyed, this, &Camera::removeParticipantDeviceModel);
mParticipantDeviceModel = participantDeviceModel;

2
linphone-app/src/components/camera/Camera.hpp
View file

@ -94,7 +94,7 @@ private:
void deactivatePreview();
void updateWindowIdLocation();
void removeParticipantDeviceModel();
void callRemoved();
void removeCallModel();
QVariantMap mLastVideoDefinition;
QTimer mLastVideoDefinitionChecker;