Added PLUGIN_NOOP to separate PLUGIN_PROVIDE from previous CALLBACK/REGISTER entries

This commit is contained in:
Tobias Brunner
2012-07-12 16:54:03 +02:00
parent c0b1fc7f8b
commit d15975c7f2
2 changed files with 19 additions and 9 deletions
+4 -2
View File
@@ -326,7 +326,8 @@ bool plugin_feature_load(plugin_t *plugin, plugin_feature_t *feature,
}
if (reg->kind == FEATURE_CALLBACK)
{
if (reg->arg.cb.f(plugin, feature, TRUE, reg->arg.cb.data))
if (!reg->arg.cb.f ||
reg->arg.cb.f(plugin, feature, TRUE, reg->arg.cb.data))
{
return TRUE;
}
@@ -409,7 +410,8 @@ bool plugin_feature_unload(plugin_t *plugin, plugin_feature_t *feature,
}
if (reg->kind == FEATURE_CALLBACK)
{
if (reg->arg.cb.f(plugin, feature, FALSE, reg->arg.cb.data))
if (!reg->arg.cb.f ||
reg->arg.cb.f(plugin, feature, FALSE, reg->arg.cb.data))
{
return TRUE;
}