mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-04-17 20:08:28 +00:00
try to fix crash in polishItems when changing conference layout
This commit is contained in:
parent
0de5964883
commit
4fca033943
1 changed files with 15 additions and 13 deletions
|
|
@ -50,19 +50,21 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
function setConferenceLayout() {
|
function setConferenceLayout() {
|
||||||
callLayout.sourceComponent = undefined // unload old view before opening the new view to avoid conflicts in Video UI.
|
Qt.callLater(function() {
|
||||||
// If stop sharing screen, reset conference layout to the previous one
|
callLayout.sourceComponent = undefined // unload old view before opening the new view to avoid conflicts in Video UI.
|
||||||
if (mainItem.conference && !mainItem.conference.core.isLocalScreenSharing && mainItem.lastConfLayoutBeforeSharing !== -1) {
|
// If stop sharing screen, reset conference layout to the previous one
|
||||||
mainItem.conferenceLayout = mainItem.lastConfLayoutBeforeSharing
|
if (mainItem.conference && !mainItem.conference.core.isLocalScreenSharing && mainItem.lastConfLayoutBeforeSharing !== -1) {
|
||||||
mainItem.lastConfLayoutBeforeSharing = -1
|
mainItem.conferenceLayout = mainItem.lastConfLayoutBeforeSharing
|
||||||
}
|
mainItem.lastConfLayoutBeforeSharing = -1
|
||||||
callLayout.sourceComponent = conference
|
}
|
||||||
? conference.core.isScreenSharingEnabled || (mainItem.conferenceLayout == LinphoneEnums.ConferenceLayout.ActiveSpeaker && participantDeviceCount > 1)
|
callLayout.sourceComponent = conference
|
||||||
? activeSpeakerComponent
|
? conference.core.isScreenSharingEnabled || (mainItem.conferenceLayout == LinphoneEnums.ConferenceLayout.ActiveSpeaker && participantDeviceCount > 1)
|
||||||
: participantDeviceCount <= 1
|
? activeSpeakerComponent
|
||||||
? waitingForOthersComponent
|
: participantDeviceCount <= 1
|
||||||
: gridComponent
|
? waitingForOthersComponent
|
||||||
: activeSpeakerComponent
|
: gridComponent
|
||||||
|
: activeSpeakerComponent
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue