From c99b16f7d7e4bf22b9d996cb8b18c412c7b918b0 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 22 May 2019 13:49:44 +0200
Subject: [PATCH] Revert "Removed useless reference to the QPluginLoader in the
 Plugin structure"

This reverts commit 1e881d0b2f4ec615e09a6735a264b0b7cbe70226 to avoid future conflicts.
---
 sdrbase/plugin/pluginmanager.cpp | 4 ++--
 sdrbase/plugin/pluginmanager.h   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp
index 9fce02b65..cb4568a05 100644
--- a/sdrbase/plugin/pluginmanager.cpp
+++ b/sdrbase/plugin/pluginmanager.cpp
@@ -163,9 +163,9 @@ void PluginManager::loadPluginsDir(const QDir& dir)
 				qWarning() << "PluginManager::loadPluginsDir: " << qPrintable(loader->errorString());
 			}
 
-			if (plugin)
+			if (plugin != 0)
 			{
-				m_plugins.append(Plugin(fileName, plugin));
+				m_plugins.append(Plugin(fileName, loader, plugin));
 			}
 			else
 			{
diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h
index c2f71b797..8c41172e5 100644
--- a/sdrbase/plugin/pluginmanager.h
+++ b/sdrbase/plugin/pluginmanager.h
@@ -42,10 +42,12 @@ public:
 	struct Plugin
 	{
 		QString filename;
+		QPluginLoader* loader;
 		PluginInterface* pluginInterface;
 
-		Plugin(const QString& _filename, PluginInterface* _plugin) :
+		Plugin(const QString& _filename, QPluginLoader* pluginLoader, PluginInterface* _plugin) :
 			filename(_filename),
+			loader(pluginLoader),
 			pluginInterface(_plugin)
 		{ }
 	};