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

git-svn-id: svn://localhost/ardour2/branches/3.0@13131 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-08-16 02:06:18 +00:00
parent 5722daf381
commit 89741cf0e9
2 changed files with 2 additions and 1 deletions

View File

@ -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' },

View File

@ -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 ();
}