rationalize (a bit) engine start/stop/restart so that it is possible to start up...

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

diff --git a/libs/ardour/export_formats_search_path.cc b/libs/ardour/export_formats_search_path.cc
index ed87a56e1af24e10c112a56eb8507f9bbd625233..cf18b14a1865bff1fa2f22d71828a51e726344e4 100644 (file)
--- a/libs/ardour/export_formats_search_path.cc
+++ b/libs/ardour/export_formats_search_path.cc
@@ -35,9 +35,16 @@ namespace ARDOUR {
 SearchPath
 export_formats_search_path ()
 {
-       SearchPath spath;
-       spath += Glib::build_filename (user_config_directory (), export_formats_dir_name);
-       spath += SearchPath(Glib::getenv (export_env_variable_name));
+       SearchPath spath (ardour_data_search_path());
+       spath.add_subdirectory_to_paths (export_formats_dir_name);
+
+       bool export_formats_path_defined = false;
+       SearchPath spath_env (Glib::getenv(export_env_variable_name, export_formats_path_defined));
+
+       if (export_formats_path_defined) {
+               spath += spath_env;
+       }
+
        return spath;
 }