Move a few declarations to first use.

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

diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc
index 7cdf75a44137a6b646904a3a450b59619a1e318c..345989277bef662f571b17585dca960fe5d15efb 100644 (file)
--- a/libs/ardour/control_protocol_search_path.cc
+++ b/libs/ardour/control_protocol_search_path.cc
@@ -34,19 +34,17 @@ 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 ());
+       SearchPath spath (user_config_directory ());
 
        spath += ardour_module_directory ();
+       spath.add_subdirectory_to_paths (surfaces_dir_name);
 
-       spath.add_subdirectory_to_paths(surfaces_dir_name);
+       bool surfaces_path_defined = false;
+       SearchPath spath_env (Glib::getenv(surfaces_env_variable_name, surfaces_path_defined));
+       
+       if (surfaces_path_defined) {
+               spath += spath_env;
+       }
 
        return spath;
 }