summaryrefslogtreecommitdiff
path: root/libs/ardour/export_formats_search_path.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-12-04 21:08:34 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-12-04 21:08:34 +0000
commitaf768c74290a0b2615846a19fcaac30fa3d3712a (patch)
tree75464eac0266d91ddda3fc7c850b2411859524e5 /libs/ardour/export_formats_search_path.cc
parent30f75c446e09f0aaa93ed73ed6e32332eda52735 (diff)
be consistent in the way we merge environment-set search paths and pre-defined ones
git-svn-id: svn://localhost/ardour2/branches/3.0@10890 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/export_formats_search_path.cc')
-rw-r--r--libs/ardour/export_formats_search_path.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/export_formats_search_path.cc b/libs/ardour/export_formats_search_path.cc
index b35d3098f0..39ccb0de13 100644
--- a/libs/ardour/export_formats_search_path.cc
+++ b/libs/ardour/export_formats_search_path.cc
@@ -35,17 +35,16 @@ namespace ARDOUR {
SearchPath
export_formats_search_path ()
{
- bool export_path_defined = false;
SearchPath spath;
spath = user_config_directory ();
spath.add_subdirectory_to_paths (export_formats_dir_name);
- std::string env_var = Glib::getenv (export_env_variable_name, export_path_defined);
+ bool export_path_defined = false;
+ SearchPath spath_env = Glib::getenv (export_env_variable_name, export_path_defined);
if (export_path_defined) {
- sys::path p = env_var;
- spath += p;
+ spath += spath_env;
}
return spath;