From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 16 Aug 2012 02:06:18 +0000 (+0000)
Subject: make --disable-plugins/-d work again, probably
X-Git-Tag: 3.0~869
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=89741cf0e985c757d696582d55564ca8f8689be2;p=ardour.git

make --disable-plugins/-d work again, probably

git-svn-id: svn://localhost/ardour2/branches/3.0@13131 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index efb64729fc..6b5f19bdd6 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -98,6 +98,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 		{ "version", 0, 0, 'v' },
 		{ "help", 0, 0, 'h' },
 		{ "bindings", 0, 0, 'b' },
+		{ "disable-plugins", 1, 0, 'd' },
 		{ "debug", 1, 0, 'D' },
 		{ "show-splash", 0, 0, 'n' },
 		{ "menus", 1, 0, 'm' },
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 94530e3890..ff58eb0f81 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1021,7 +1021,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, boost::shared_ptr<
 
 		}
 
-		if (activation_allowed) {
+		if (activation_allowed && !_session.get_disable_all_loaded_plugins()) {
 			processor->activate ();
 		}