Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1193 Plugin system checks dependency before loading plugins.

Browse source
This commit is contained in:
dnk-88 2011-09-26 12:36:04 +03:00
parent 16300c5776
commit ecf3f2ae5e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_manager.cpp
View file

@ -214,9 +214,6 @@ void PluginManager::setPluginState(PluginSpec *spec, int destState)
switch (destState) switch (destState)
{ {
case State::Loaded:
spec->loadLibrary();
return;
case State::Resolved: case State::Resolved:
spec->resolveDependencies(m_pluginSpecs); spec->resolveDependencies(m_pluginSpecs);
return; return;
@ -234,13 +231,16 @@ void PluginManager::setPluginState(PluginSpec *spec, int destState)
if (depSpec->state() != destState) if (depSpec->state() != destState)
{ {
spec->m_hasError = true; spec->m_hasError = true;
spec->m_errorString = tr("Cannot initializing plugin because dependency failed to load: %1\nReason: %2") spec->m_errorString = tr("Cannot load plugin because dependency failed to load: %1")
.arg(depSpec->name()).arg(depSpec->errorString()); .arg(depSpec->name());
return; return;
} }
} }
switch (destState) switch (destState)
{ {
case State::Loaded:
spec->loadLibrary();
return;
case State::Initialized: case State::Initialized:
spec->initializePlugin(); spec->initializePlugin();
break; break;