From 84c1bbb4c7a3eb09638e4cd2e676fe885a0b209e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 2 Apr 2015 19:02:42 -0400 Subject: [PATCH] when copying A3 config files, consider that the user may have /config rather than /ardour.rc. This will be true if they have been self-building from git or using nightlies. --- libs/ardour/globals.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 6e16d5480f..288e69dc9e 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -270,9 +270,20 @@ copy_configuration_files (string const & old_dir, string const & new_dir, int ol copy_file (old_name, new_name); - /* can only copy ardour.rc - UI config is not compatible */ + /* can only copy ardour.rc/config - UI config is not compatible */ + + /* users who have been using git/nightlies since the last + * release of 3.5 will have $CONFIG/config rather than + * $CONFIG/ardour.rc. Pick up the newer "old" config file, + * to avoid confusion. + */ + + string old_name = Glib::build_filename (old_dir, X_("config")); + + if (!Glib::file_test (old_name, Glib::FILE_TEST_EXISTS)) { + old_name = Glib::build_filename (old_dir, X_("ardour.rc")); + } - old_name = Glib::build_filename (old_dir, X_("ardour.rc")); new_name = Glib::build_filename (new_dir, X_("config")); copy_file (old_name, new_name);