on session-load: skip output-change-handler until IOs are restored

[ardour.git] / libs / ardour / panner_search_path.cc

diff --git a/libs/ardour/panner_search_path.cc b/libs/ardour/panner_search_path.cc
index cbb62bbf3c3bbaf34eafecc36d81f5f150590727..63802ffc4e7e113a3e717236ca9a94b7d87eb375 100644 (file)
--- a/libs/ardour/panner_search_path.cc
+++ b/libs/ardour/panner_search_path.cc
@@ -34,18 +34,11 @@ namespace ARDOUR {
 SearchPath
 panner_search_path ()
 {
-       bool panner_path_defined = false;
-       SearchPath spath_env (Glib::getenv(panner_env_variable_name, panner_path_defined));
-
-       if (panner_path_defined) {
-               return spath_env;
-       }
-
-       SearchPath spath (user_config_directory ());
-
-       spath += ardour_module_directory ();
+       SearchPath spath(user_config_directory ());
+       spath += ardour_dll_directory ();
        spath.add_subdirectory_to_paths(panner_dir_name);
 
+       spath += SearchPath(Glib::getenv(panner_env_variable_name));
        return spath;
 }