From bed3475362f68a660d56dd31546b13e49586e36e Mon Sep 17 00:00:00 2001 From: Mikaƫl Capelle Date: Tue, 17 Nov 2020 14:28:00 +0100 Subject: Fix crash for proxied plugins on first startup. --- src/plugincontainer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugincontainer.cpp') diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp index 7884498c..f7a556e0 100644 --- a/src/plugincontainer.cpp +++ b/src/plugincontainer.cpp @@ -413,12 +413,12 @@ bool PluginContainer::initPlugin(IPlugin *plugin, IPluginProxy *pluginProxy, boo // Check if it is a proxy plugin: bool isProxy = dynamic_cast(plugin); + auto [it, bl] = m_Requirements.emplace(plugin, PluginRequirements(this, plugin, proxy, pluginProxy)); + if (!m_Organizer && !isProxy) { return true; } - auto [it, bl] = m_Requirements.emplace(plugin, PluginRequirements(this, plugin, proxy, pluginProxy)); - if (skipInit) { return true; } @@ -616,8 +616,6 @@ IPlugin* PluginContainer::registerPlugin(QObject *plugin, const QString &fileNam } } - log::debug("no matching plugin interface"); - return nullptr; } -- cgit v1.3.1