13
0

fix --disable-plugins (bypass ‘em all)

This commit is contained in:
Robin Gareus 2015-03-21 17:52:27 +01:00
parent 614fc8c7bb
commit a10e17411f
2 changed files with 2 additions and 2 deletions

View File

@ -225,7 +225,7 @@ Processor::set_state (const XMLNode& node, int version)
}
}
bool const a = string_is_affirmative (prop->value ());
bool const a = string_is_affirmative (prop->value ()) && !_session.get_disable_all_loaded_plugins();
if (_active != a) {
if (a) {
activate ();

View File

@ -1226,7 +1226,7 @@ Route::add_processor_from_xml_2X (const XMLNode& node, int version)
//A2 uses the "active" flag in the toplevel redirect node, not in the child plugin/IO
if (i != children.end()) {
if ((prop = (*i)->property (X_("active"))) != 0) {
if ( string_is_affirmative (prop->value()) )
if ( string_is_affirmative (prop->value()) && !_session.get_disable_all_loaded_plugins() )
processor->activate();
else
processor->deactivate();