From 3a56004f65c3d61917e9452a6f54b685748856e1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 9 May 2015 19:33:26 -0400 Subject: [PATCH] fix crash caused by missing return; add explanatory comments --- libs/ardour/filesystem_paths.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index 3452f10ba6..4dfac59bc3 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -49,17 +49,25 @@ user_config_directory_name (int version = -1) version = atoi (X_(PROGRAM_VERSION)); } + /* ARDOUR::Profile may not be available when this is + called, so rely on build-time detection of the + product name etc. + */ + #ifdef USE_TRACKS_CODE_FEATURES /* Tracks does not use versioned configuration folders, which may or may not be problematic in the future. */ - const string config_dir_name = X_(PROGRAM_NAME); + return X_(PROGRAM_NAME); + #else const string config_dir_name = string_compose ("%1%2", X_(PROGRAM_NAME), version); #if defined (__APPLE__) || defined (PLATFORM_WINDOWS) + /* Use mixed-case folder name on OS X and Windows */ return config_dir_name; #else + /* use lower case folder name on Linux */ return downcase (config_dir_name); #endif #endif