diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-08-16 02:06:18 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-08-16 02:06:18 +0000 |
| commit | 89741cf0e985c757d696582d55564ca8f8689be2 (patch) | |
| tree | a9e6ce97cf27733a00f9fbbd18aff51c75138bc1 | |
| parent | 5722daf38136ce0724d801264df460999e0b2f48 (diff) | |
make --disable-plugins/-d work again, probably
git-svn-id: svn://localhost/ardour2/branches/3.0@13131 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/opts.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 2 |
2 files changed, 2 insertions, 1 deletions
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 (); } |