diff options
| author | Robin Gareus <robin@gareus.org> | 2018-01-30 03:59:47 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2018-01-30 03:59:58 +0100 |
| commit | 19f62d331c04711536c283f21e96b7ff20d0257f (patch) | |
| tree | c0e835b0a7d58d4c65ab8db559c7999ef5abf8f5 /libs/ardour/plugin_manager.cc | |
| parent | d282b91d961c73d1b5bd6c5fe85d8b090daa00bd (diff) | |
Fix plugin factory tags
* tag-file is loaded early on (before scanning plugin) retain factory
set tag from file, don't use plugin-categories.
* load user plugin-tag file after factory plugin-tag file
Diffstat (limited to 'libs/ardour/plugin_manager.cc')
| -rw-r--r-- | libs/ardour/plugin_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index eaf5eede9c..e1d8110076 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -1550,7 +1550,7 @@ PluginManager::load_tags () vector<std::string> tmp; find_files_matching_pattern (tmp, plugin_metadata_search_path (), "plugin_tags"); - for (vector<std::string>::const_iterator p = tmp.begin (); p != tmp.end(); ++p) { + for (vector<std::string>::const_reverse_iterator p = tmp.rbegin (); p != tmp.rend(); ++p) { std::string path = *p; info << string_compose (_("Loading plugin meta data file %1"), path) << endmsg; if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { @@ -1591,7 +1591,7 @@ PluginManager::set_tags (PluginType t, string id, string tag, bool factory, bool if (i == ptags.end()) { ptags.insert (ps); } else { - if (!(*i).user_set || force || ((*i).user_set && !factory)) { + if (force || ((*i).user_set && !factory)) { ptags.erase (ps); ptags.insert (ps); } |