From 5d0b6b0eab489e2010f6286647864889cae7422a Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Thu, 11 Jun 2020 13:23:03 +0200
Subject: Manually unload plugins to avoid issue with automatic unloading.

---
 src/plugincontainer.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/plugincontainer.cpp')

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index caab2115..d989fac9 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -28,6 +28,10 @@ PluginContainer::PluginContainer(OrganizerCore *organizer)
 {
 }
 
+PluginContainer::~PluginContainer() {
+  m_Organizer = nullptr;
+  unloadPlugins();
+}
 
 void PluginContainer::setUserInterface(IUserInterface *userInterface, QWidget *widget)
 {
@@ -213,7 +217,9 @@ void PluginContainer::unloadPlugins()
   }
 
   // disconnect all slots before unloading plugins so plugins don't have to take care of that
-  m_Organizer->disconnectPlugins();
+  if (m_Organizer != nullptr) {
+    m_Organizer->disconnectPlugins();
+  }
 
   bf::for_each(m_Plugins, clearPlugins());
 
-- 
cgit v1.3.1