diff --git a/Linphone/model/call/CallModel.cpp b/Linphone/model/call/CallModel.cpp index 196af199a..4dd213edb 100644 --- a/Linphone/model/call/CallModel.cpp +++ b/Linphone/model/call/CallModel.cpp @@ -130,7 +130,7 @@ void CallModel::activateLocalVideo(std::shared_ptr ¶ms lInfo() << sLog() .arg("Updating call with video enabled and media direction set to %1") .arg((int)params->getVideoDirection()); - params->enableVideo(SettingsModel::getInstance()->getVideoEnabled() && enable); + if (enable) params->enableVideo(SettingsModel::getInstance()->getVideoEnabled()); auto videoDirection = enable ? linphone::MediaDirection::SendRecv : linphone::MediaDirection::RecvOnly; params->setVideoDirection(videoDirection); } @@ -410,7 +410,7 @@ void CallModel::onStateChanged(const std::shared_ptr &call, auto remoteVideoDirection = call->getRemoteParams()->getVideoDirection(); emit localVideoEnabledChanged(videoDirection == linphone::MediaDirection::SendOnly || videoDirection == linphone::MediaDirection::SendRecv); - emit remoteVideoEnabledChanged(remoteVideoDirection == linphone::MediaDirection::RecvOnly || + emit remoteVideoEnabledChanged(remoteVideoDirection == linphone::MediaDirection::SendOnly || remoteVideoDirection == linphone::MediaDirection::SendRecv); updateConferenceVideoLayout(); } else if (state == linphone::Call::State::End || state == linphone::Call::State::Error) { diff --git a/Linphone/view/Control/Display/Sticker.qml b/Linphone/view/Control/Display/Sticker.qml index cba54da36..6a3f83516 100644 --- a/Linphone/view/Control/Display/Sticker.qml +++ b/Linphone/view/Control/Display/Sticker.qml @@ -54,8 +54,9 @@ Item { : "" property var identityAddress: account ? UtilsCpp.getDisplayName(account.core.identityAddress) : null - property bool videoEnabled: (previewEnabled && call && call.core.localVideoEnabled) - || (participantDevice && participantDevice.core.videoEnabled) + property bool videoEnabled: (previewEnabled && call && call.core.localVideoEnabled) + || (!previewEnabled && call && call.core.remoteVideoEnabled) + || (participantDevice && participantDevice.core.videoEnabled) property string qmlName property bool displayAll : !!mainItem.call property bool mutedStatus: participantDevice