diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-13 17:15:23 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-13 18:43:53 -0400 |
commit | f7844f48937fbb3a7744c131304ab8dc8c305580 (patch) | |
tree | 3b021737f69ac53f6c82f491ea283177b602cbb1 /gtk2_ardour/utils.cc | |
parent | f3121131632239c106058edc138ae95e847f1f6a (diff) |
do most of the work related to adding new anchored trim cursors (but debugging/analysis continues)
Diffstat (limited to 'gtk2_ardour/utils.cc')
-rw-r--r-- | gtk2_ardour/utils.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 8ded1a2f81..facbe92db5 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -698,10 +698,12 @@ get_icon_path (const char* cname, string icon_set) name += X_(".png"); Searchpath spath(ARDOUR::ardour_data_search_path()); - + if (!icon_set.empty() && icon_set != _("default")) { - string subdir = Glib::build_filename ("icons", icon_set); - spath.add_subdirectory_to_paths (subdir); + + /* add "icons/icon_set" but .. not allowed to add both of these at once */ + spath.add_subdirectory_to_paths ("icons"); + spath.add_subdirectory_to_paths (icon_set); find_file_in_search_path (spath, name, data_file_path); } |