From 4a301595bdfb8ada086c501630181c07594f52a8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 29 Apr 2015 18:23:09 -0400 Subject: rename user's customized color file when resetting theme. Fixes #6286 --- gtk2_ardour/theme_manager.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gtk2_ardour/theme_manager.cc') diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 1af708e524..1f1baa84f1 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -24,6 +24,8 @@ #include "fix_carbon.h" +#include + #include #include @@ -385,6 +387,19 @@ ThemeManager::set_ui_to_state() void ThemeManager::reset_canvas_colors() { + string cfile; + string basename; + + basename = "my-"; + basename += ARDOUR_UI::config()->get_color_file(); + basename += ".colors"; + + if (find_file (ardour_config_search_path(), basename, cfile)) { + string backup = cfile + string (X_(".old")); + g_rename (cfile.c_str(), backup.c_str()); + /* don't really care if it fails */ + } + ARDOUR_UI::config()->load_defaults(); ARDOUR_UI::config()->save_state (); set_ui_to_state(); -- cgit v1.2.3