From a10e17411fa834992a82326c734845fbda5d22b9 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 21 Mar 2015 17:52:27 +0100 Subject: fix --disable-plugins (bypass ‘em all) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/ardour/processor.cc | 2 +- libs/ardour/route.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc index fa6cab579a..caa240ce22 100644 --- a/libs/ardour/processor.cc +++ b/libs/ardour/processor.cc @@ -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 (); diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 72580e0069..36adbfa148 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -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(); -- cgit v1.2.3