From facb4e7fe4bcc30539ea3fc79a23ab217735a5ab Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Wed, 2 Dec 2020 21:04:18 +0100
Subject: Do not store installers in InstallationManager, use the ones from
 PluginContainer.

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

(limited to 'src/plugincontainer.cpp')

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index 5a485dfe..1fb8638f 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -301,6 +301,9 @@ void PluginContainer::setUserInterface(IUserInterface *userInterface)
     for (IPluginTool* tool : bf::at_key<IPluginTool>(m_Plugins)) {
       tool->setParentWidget(userInterface->mainWindow());
     }
+    for (IPluginInstaller* installer : bf::at_key<IPluginInstaller>(m_Plugins)) {
+      installer->setParentWidget(userInterface->mainWindow());
+    }
   }
 
   m_UserInterface = userInterface;
@@ -537,7 +540,7 @@ IPlugin* PluginContainer::registerPlugin(QObject *plugin, const QString &fileNam
     if (initPlugin(installer, pluginProxy, skipInit)) {
       bf::at_key<IPluginInstaller>(m_Plugins).push_back(installer);
       if (m_Organizer) {
-        m_Organizer->installationManager()->registerInstaller(installer);
+        installer->setInstallationManager(m_Organizer->installationManager());
       }
       return installer;
     }
-- 
cgit v1.3.1