X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcontrol_protocol_search_path.cc;h=254cd03fe94c23fb9a91c4460d6b76d97ea4c706;hb=d7e39ee5c779ab5e118ecea60bb3f86e94fba069;hp=c7c9b635a38fad610e58617ac6e1eb1ee5219fc0;hpb=40e2a6b16b47acf1f19a31f5e6d1cd463c45e1b6;p=ardour.git

diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc
index c7c9b635a3..254cd03fe9 100644
--- a/libs/ardour/control_protocol_search_path.cc
+++ b/libs/ardour/control_protocol_search_path.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include <iostream>
+
 #include <glibmm/miscutils.h>
 
 #include "ardour/control_protocol_search_path.h"
@@ -34,18 +36,11 @@ namespace ARDOUR {
 SearchPath
 control_protocol_search_path ()
 {
-	bool surfaces_path_defined = false;
-	SearchPath spath_env (Glib::getenv(surfaces_env_variable_name, surfaces_path_defined));
-
-	if (surfaces_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 (surfaces_dir_name);
-
+	
+	spath += SearchPath(Glib::getenv(surfaces_env_variable_name));
 	return spath;
 }