From 9d5f14751fb209411872f202a8712ac84bec333e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 14 Jan 2022 16:28:44 -0500 Subject: gnu: jami: Fix crash on exit. * gnu/packages/patches/jami-fix-crash-on-quit.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/jami.scm (jami): Apply it. --- gnu/packages/patches/jami-fix-crash-on-quit.patch | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 gnu/packages/patches/jami-fix-crash-on-quit.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/jami-fix-crash-on-quit.patch b/gnu/packages/patches/jami-fix-crash-on-quit.patch new file mode 100644 index 0000000000..c25bce588a --- /dev/null +++ b/gnu/packages/patches/jami-fix-crash-on-quit.patch @@ -0,0 +1,34 @@ +Retrieved from: +https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/83f68573324a453a6d26e025fd6439f175a79d1b.diff. + +With the 'client-qt' prefix added to match the file hierarchy of the release tarball. + +diff --git a/client-qt/src/mainapplication.cpp b/client-qt/src/mainapplication.cpp +index 0c3209fc6fa7c528bec197f1cf9332758170441c..278f19287b86dd2c916935ab0930cbe0abb35d26 100644 +--- a/client-qt/src/mainapplication.cpp ++++ b/client-qt/src/mainapplication.cpp +@@ -155,7 +155,11 @@ MainApplication::MainApplication(int& argc, char** argv) + QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); }); + } + +-MainApplication::~MainApplication() {} ++MainApplication::~MainApplication() ++{ ++ engine_.reset(); ++ lrcInstance_.reset(); ++} + + bool + MainApplication::init() +diff --git a/src/mainapplication.h b/src/mainapplication.h +index 51306be829478b9fbc1c61a08aeb96938be26dac..4047e3abb3cfd3e6250387a37fa5a896e9bc4161 100644 +--- a/client-qt/src/mainapplication.h ++++ b/client-qt/src/mainapplication.h +@@ -80,7 +80,6 @@ private: + private: + QScopedPointer debugFile_; + QScopedPointer engine_; +- + QScopedPointer lrcInstance_; + + QScopedPointer connectivityMonitor_; -- cgit 1.4.1