summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMikaël Capelle <capelle.mikael@gmail.com>2020-11-17 14:28:00 +0100
committerMikaël Capelle <capelle.mikael@gmail.com>2020-11-17 14:28:00 +0100
commitbed3475362f68a660d56dd31546b13e49586e36e (patch)
tree7192da5e6963871e2f23fde0b78a050b651a4787 /src
parente9a4f91fac08087ef83ce5b7716abeda90b6bde3 (diff)
Fix crash for proxied plugins on first startup.
Diffstat (limited to 'src')
-rw-r--r--src/plugincontainer.cpp6
1 files changed, 2 insertions, 4 deletions
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<IPluginProxy*>(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;
}