This commit is contained in:
Julien Wadel 2024-04-22 18:16:25 +02:00
parent 23ddc9ac88
commit edc2ace096
5 changed files with 5 additions and 5 deletions

View file

@ -258,7 +258,6 @@ void App::clean() {
delete mEngine; delete mEngine;
mEngine = nullptr; mEngine = nullptr;
if (mSettings) { if (mSettings) {
mSettings->deleteLater();
mSettings = nullptr; mSettings = nullptr;
} }
mLinphoneThread->wait(250); mLinphoneThread->wait(250);

View file

@ -205,6 +205,7 @@ void CameraGui::setWindowIdLocation(const WindowIdLocation &location) {
mWindowIdLocation = location; mWindowIdLocation = location;
if (mWindowIdLocation == CorePreview) PreviewManager::getInstance()->subscribe(this); if (mWindowIdLocation == CorePreview) PreviewManager::getInstance()->subscribe(this);
update(); update();
QTimer::singleShot(100, this, &CameraGui::requestNewRenderer);
// if (mWindowIdLocation == WindowIdLocation::CorePreview) { // if (mWindowIdLocation == WindowIdLocation::CorePreview) {
// mLastVideoDefinition = // mLastVideoDefinition =
// CoreManager::getInstance()->getSettingsModel()->getCurrentPreviewVideoDefinition(); emit // CoreManager::getInstance()->getSettingsModel()->getCurrentPreviewVideoDefinition(); emit

View file

@ -1,5 +1,5 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 as Control import QtQuick.Controls.Basic 2.2 as Control
import QtQuick.Effects import QtQuick.Effects
import QtQuick.Layouts import QtQuick.Layouts
import Linphone import Linphone

View file

@ -87,7 +87,7 @@ Item {
triggeredOnStart: true triggeredOnStart: true
onTriggered: {cameraLoader.reset = !cameraLoader.reset} onTriggered: {cameraLoader.reset = !cameraLoader.reset}
} }
active: mainItem.visible && mainItem.videoEnabled && !mainItem.reset active: mainItem.visible && mainItem.videoEnabled && !cameraLoader.reset
onActiveChanged: console.log("("+mainItem.qmlName+") Camera active " + active) onActiveChanged: console.log("("+mainItem.qmlName+") Camera active " + active)
sourceComponent: cameraComponent sourceComponent: cameraComponent
} }

View file

@ -142,7 +142,7 @@ AbstractMainPage {
visible: favoriteList.contentHeight > 0 visible: favoriteList.contentHeight > 0
Layout.leftMargin: leftPanel.leftMargin Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin Layout.rightMargin: leftPanel.rightMargin
spacing: 16 * Defaultstyle.dp spacing: 16 * DefaultStyle.dp
RowLayout { RowLayout {
spacing: 0 spacing: 0
Text { Text {
@ -190,7 +190,7 @@ AbstractMainPage {
visible: contactList.count > 0 visible: contactList.count > 0
Layout.leftMargin: leftPanel.leftMargin Layout.leftMargin: leftPanel.leftMargin
Layout.rightMargin: leftPanel.rightMargin Layout.rightMargin: leftPanel.rightMargin
spacing: 16 * Defaultstyle.dp spacing: 16 * DefaultStyle.dp
RowLayout { RowLayout {
spacing: 0 spacing: 0
Text { Text {