thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BASE: Load all plugins linked inside detection plugin

Browse source 
This was done in UncachedPluginManager but not in PluginManager
This commit is contained in:
Le Philousophe 2021-05-08 23:32:16 +02:00
parent 471cf9624c
commit 1ac759abdc
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/plugins.cpp
View file

@ -544,6 +544,22 @@ void PluginManager::loadAllPlugins() {
PluginList pl((*pp)->getPlugins()); PluginList pl((*pp)->getPlugins());
Common::for_each(pl.begin(), pl.end(), Common::bind1st(Common::mem_fun(&PluginManager::tryLoadPlugin), this)); Common::for_each(pl.begin(), pl.end(), Common::bind1st(Common::mem_fun(&PluginManager::tryLoadPlugin), this));
} }
#ifndef DETECTION_STATIC
/*
* When detection is dynamic, loading above only gets us a PLUGIN_TYPE_DETECTION plugin
* We must register all plugins linked in it in order to use them
*/
PluginList dpl = getPlugins(PLUGIN_TYPE_DETECTION);
_pluginsInMem[PLUGIN_TYPE_ENGINE_DETECTION].clear();
for (PluginList::iterator it = dpl.begin();
it != dpl.end();
++it) {
const Detection &detectionConnect = (*it)->get<Detection>();
const PluginList &pl = detectionConnect.getPlugins();
Common::for_each(pl.begin(), pl.end(), Common::bind1st(Common::mem_fun(&PluginManager::tryLoadPlugin), this));
}
#endif
} }
void PluginManager::loadAllPluginsOfType(PluginType type) { void PluginManager::loadAllPluginsOfType(PluginType type) {