diff options
Diffstat (limited to 'libs/ardour/panner_search_path.cc')
| -rw-r--r-- | libs/ardour/panner_search_path.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/ardour/panner_search_path.cc b/libs/ardour/panner_search_path.cc index 2889063ca4..c400aa6c3b 100644 --- a/libs/ardour/panner_search_path.cc +++ b/libs/ardour/panner_search_path.cc @@ -35,14 +35,11 @@ Searchpath panner_search_path () { Searchpath spath(user_config_directory ()); + spath += ardour_dll_directory (); spath.add_subdirectory_to_paths(panner_dir_name); -<<<<<<< HEAD - spath += SearchPath(Glib::getenv(panner_env_variable_name)); -======= - spath += Searchpath(Glib::getenv(panner_env_variable_name)); ->>>>>>> windows+cc + return spath; } |