diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 227feaebb..68e038c22 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -258,7 +258,6 @@ void App::clean() { delete mEngine; mEngine = nullptr; if (mSettings) { - mSettings->deleteLater(); mSettings = nullptr; } mLinphoneThread->wait(250); diff --git a/Linphone/core/camera/CameraGui.cpp b/Linphone/core/camera/CameraGui.cpp index 81d1cc486..ae4fa2104 100644 --- a/Linphone/core/camera/CameraGui.cpp +++ b/Linphone/core/camera/CameraGui.cpp @@ -205,6 +205,7 @@ void CameraGui::setWindowIdLocation(const WindowIdLocation &location) { mWindowIdLocation = location; if (mWindowIdLocation == CorePreview) PreviewManager::getInstance()->subscribe(this); update(); + QTimer::singleShot(100, this, &CameraGui::requestNewRenderer); // if (mWindowIdLocation == WindowIdLocation::CorePreview) { // mLastVideoDefinition = // CoreManager::getInstance()->getSettingsModel()->getCurrentPreviewVideoDefinition(); emit diff --git a/Linphone/view/Item/Button.qml b/Linphone/view/Item/Button.qml index 7eb60a66a..4b26cbb2a 100644 --- a/Linphone/view/Item/Button.qml +++ b/Linphone/view/Item/Button.qml @@ -1,5 +1,5 @@ import QtQuick 2.7 -import QtQuick.Controls 2.2 as Control +import QtQuick.Controls.Basic 2.2 as Control import QtQuick.Effects import QtQuick.Layouts import Linphone diff --git a/Linphone/view/Item/Contact/Sticker.qml b/Linphone/view/Item/Contact/Sticker.qml index ae6c5ddb4..69a9a0e09 100644 --- a/Linphone/view/Item/Contact/Sticker.qml +++ b/Linphone/view/Item/Contact/Sticker.qml @@ -87,7 +87,7 @@ Item { triggeredOnStart: true 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) sourceComponent: cameraComponent } diff --git a/Linphone/view/Page/Main/ContactPage.qml b/Linphone/view/Page/Main/ContactPage.qml index 055aedad0..e95b42bfe 100644 --- a/Linphone/view/Page/Main/ContactPage.qml +++ b/Linphone/view/Page/Main/ContactPage.qml @@ -142,7 +142,7 @@ AbstractMainPage { visible: favoriteList.contentHeight > 0 Layout.leftMargin: leftPanel.leftMargin Layout.rightMargin: leftPanel.rightMargin - spacing: 16 * Defaultstyle.dp + spacing: 16 * DefaultStyle.dp RowLayout { spacing: 0 Text { @@ -190,7 +190,7 @@ AbstractMainPage { visible: contactList.count > 0 Layout.leftMargin: leftPanel.leftMargin Layout.rightMargin: leftPanel.rightMargin - spacing: 16 * Defaultstyle.dp + spacing: 16 * DefaultStyle.dp RowLayout { spacing: 0 Text {