mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-05-07 14:44:01 +00:00
Fix length error on call list (QML).
Reopen camera when going to the waiting room without changing conference Model.
This commit is contained in:
parent
7a48b83c74
commit
b0d373574f
3 changed files with 7 additions and 4 deletions
|
|
@ -36,7 +36,7 @@ ListView {
|
|||
if(lastCall && lastCall.status === CallModel.CallStatusConnected)
|
||||
Logic.setIndexWithCall(lastCall)
|
||||
else{
|
||||
for(var i = 0 ; i < model.length() ; ++i){
|
||||
for(var i = 0 ; i < model.rowCount() ; ++i){
|
||||
var call = model.data(model.index(i, 0))
|
||||
if( call && call.status === CallModel.CallStatusConnected){
|
||||
Logic.updateSelectedCall(call, i)
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ function openConferenceManager (params, exitHandler) {
|
|||
|
||||
function openWaitingRoom(model){
|
||||
calls.refreshCall()
|
||||
if(window.conferenceInfoModel)
|
||||
window.conferenceInfoModel = null;
|
||||
if(window.conferenceInfoModel && middlePane.sourceComponent == waitingRoom)
|
||||
middlePane.item.reset()
|
||||
window.conferenceInfoModel = model
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,10 @@ Rectangle {
|
|||
|
||||
signal cancel()
|
||||
|
||||
function reset(){
|
||||
close()
|
||||
open()
|
||||
}
|
||||
function close(){
|
||||
mainItem.previewLoaderEnabled = false// Need it to close camera.
|
||||
}
|
||||
|
|
@ -35,7 +39,6 @@ Rectangle {
|
|||
|
||||
//onCallModelChanged: callModel ? contentsStack.replace(callingComponent) : contentsStack.replace(cameraComponent)
|
||||
//onCallModelChanged: contentsStack.flipped = !!callModel
|
||||
|
||||
Component.onDestruction: {mainItem.previewLoaderEnabled = false;_sipAddressObserver=null}// Need to set it to null because of not calling destructor if not.
|
||||
|
||||
Connections{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue