lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-23 00:03:55 +02:00
Code Activity

mainapplication: fix destruction ordering

Browse source 
Every models (like UtilsAdapter for example) owns a pointer of
LRCInstance. So, when the MainApplication is destroyed, the QmlEngine
and all structures owning a pointer of LRCInstance MUST be destroyed
before LRCInstance to avoid any segfault

GitLab: #631
Change-Id: Id30aaca325fe7172188bba468acd73525e62a34a
This commit is contained in:
Sébastien Blin 2021-12-22 17:36:29 -05:00
parent 84a60d39df
commit 83f6857332
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mainapplication.cpp
View file

@ -155,7 +155,11 @@ MainApplication::MainApplication(int& argc, char** argv)
QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); }); QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); });
} }
MainApplication::~MainApplication() {} MainApplication::~MainApplication()
{
engine_.reset();
lrcInstance_.reset();
}
bool bool
MainApplication::init() MainApplication::init()

1
src/mainapplication.h
View file

@ -80,7 +80,6 @@ private:
private: private:
QScopedPointer<QFile> debugFile_; QScopedPointer<QFile> debugFile_;
QScopedPointer<QQmlApplicationEngine> engine_; QScopedPointer<QQmlApplicationEngine> engine_;
QScopedPointer<LRCInstance> lrcInstance_; QScopedPointer<LRCInstance> lrcInstance_;
QScopedPointer<ConnectivityMonitor> connectivityMonitor_; QScopedPointer<ConnectivityMonitor> connectivityMonitor_;