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

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index fa6cab579ad7cff165ddc111c4beba1afc6fadae..caa240ce228ecc0125e786b2146b4e3e3773a442 100644 (file)
--- 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 72580e006969215bfb1094f87f0b2d50fe18760c..36adbfa148f6b4e9442a5bb5495a80e78703e3f3 100644 (file)
--- 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();