ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix some more thinkos related to user color file management

This commit is contained in:
Paul Davis 2016-06-21 19:39:13 -04:00
parent 74f567b789
commit 68b6d0d796
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/color_theme_manager.cc
View File

@ -231,7 +231,9 @@ ColorThemeManager::reset_canvas_colors()
string cfile;
string basename;
basename = UIConfiguration::instance().color_file_name (false, running_from_source_tree(), false);
/* look for a versioned user-owned color file, and try to rename it */
basename = UIConfiguration::instance().color_file_name (true, false, true);
if (find_file (ardour_config_search_path(), basename, cfile)) {
string backup = cfile + string (X_(".old"));

6
gtk2_ardour/ui_config.cc
View File

@ -300,12 +300,14 @@ UIConfiguration::load_color_theme (bool allow_own)
PBD::Searchpath sp (user_config_directory());
if (find_file (sp, color_file_name (true, running_from_source, true), cfile)) {
/* user's own color files never have the program name in them */
if (find_file (sp, color_file_name (true, false, true), cfile)) {
found = true;
}
if (!found) {
if (find_file (sp, color_file_name (true, running_from_source, false), cfile)) {
if (find_file (sp, color_file_name (true, false, false), cfile)) {
found = true;
}
}