From a52890bdeabfc640955c818d58c0be4618f08232 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 9 Jan 2023 10:44:33 +0100 Subject: [PATCH] Fix a crash at startup for using uninitialized settings model. Update SDK to 5.2.8 --- CHANGELOG.md | 6 ++++++ linphone-app/src/components/core/CoreManager.cpp | 4 ++++ linphone-app/src/components/core/CoreManager.hpp | 2 ++ linphone-app/ui/views/App/Main/MainWindowMenuBar.qml | 2 +- linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml | 2 +- linphone-sdk | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 859a646d7..2275d584c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 5.0.5 - 2023-01-09 + +### Fixed +- Crash at startup +- Update SDK to 5.2.8 + ## 5.0.4 - 2022-12-28 ### Fixed diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp index c4c013123..b04f30113 100644 --- a/linphone-app/src/components/core/CoreManager.cpp +++ b/linphone-app/src/components/core/CoreManager.cpp @@ -111,6 +111,10 @@ void CoreManager::initCoreManager(){ emit coreManagerInitialized(); } +bool CoreManager::isInitialized() const{ + return mStarted; +} + AbstractEventCountNotifier * CoreManager::getEventCountNotifier(){ return mEventCountNotifier; } diff --git a/linphone-app/src/components/core/CoreManager.hpp b/linphone-app/src/components/core/CoreManager.hpp index 3174e106b..637cac4f9 100644 --- a/linphone-app/src/components/core/CoreManager.hpp +++ b/linphone-app/src/components/core/CoreManager.hpp @@ -56,6 +56,7 @@ class CoreManager : public QObject { Q_PROPERTY(QString downloadUrl READ getDownloadUrl CONSTANT) Q_PROPERTY(int eventCount READ getEventCount NOTIFY eventCountChanged) Q_PROPERTY(int callLogsCount READ getCallLogsCount NOTIFY callLogsCountChanged) + Q_PROPERTY(bool initialized READ isInitialized NOTIFY coreManagerInitialized) public: bool started () const { @@ -162,6 +163,7 @@ public: std::list> getAccountList()const; static bool isInstanciated(){return mInstance!=nullptr;} + bool isInitialized() const; Q_INVOKABLE bool isLastRemoteProvisioningGood(); Q_INVOKABLE QString getUserAgent()const; diff --git a/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml index a6285ea4f..f02d0f489 100644 --- a/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml +++ b/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml @@ -65,7 +65,7 @@ Item { } MenuItem { - visible: SettingsModel.isCheckForUpdateAvailable() + visible: CoreManager.initialized && SettingsModel.isCheckForUpdateAvailable() //: 'Check for updates' : Item menu for checking updates text: qsTr('checkForUpdates') diff --git a/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml b/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml index f61306bbd..ee9425d5b 100644 --- a/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml +++ b/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml @@ -27,7 +27,7 @@ MenuBar { MenuItem { - visible: SettingsModel.isCheckForUpdateAvailable() + visible: CoreManager.initialized && SettingsModel.isCheckForUpdateAvailable() //: 'Check for updates' : Item menu for checking updates text: qsTr('checkForUpdates') role: MenuItem.ApplicationSpecificRole diff --git a/linphone-sdk b/linphone-sdk index a7d8c15cb..c50ef2612 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit a7d8c15cb3c0b997b5182f680d64856a3d63a218 +Subproject commit c50ef261270294c2b87d5abdfdfe5dc0cb841726