Some more error handling

Try to undo the renaming of the template dir in case the writing of the new
template file fails.

diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
index 62666887a89b3ccce48430c7d1cddd1e528e8701..f4150e80f1851b32c0df90e995cce699a022b567 100644 (file)
--- a/gtk2_ardour/template_dialog.cc
+++ b/gtk2_ardour/template_dialog.cc
@@ -317,7 +317,7 @@ SessionTemplateManager::delete_selected_template ()
 void
 RouteTemplateManager::rename_template (TreeModel::iterator& item, const Glib::ustring& new_name)
 {
-       const string name = item->get_value (_template_columns.name);
+       const string old_name = item->get_value (_template_columns.name);
        const string old_filepath = item->get_value (_template_columns.path);
        const string new_filepath = Glib::build_filename (user_route_template_directory(), new_name+".template");
 
@@ -328,11 +328,12 @@ RouteTemplateManager::rename_template (TreeModel::iterator& item, const Glib::us
        }
        tree.root()->children().front()->set_property (X_("name"), new_name);
 
-       const bool adjusted = adjust_plugin_paths (tree.root(), name, string (new_name));
+       const bool adjusted = adjust_plugin_paths (tree.root(), old_name, string (new_name));
+
+       const string old_state_dir = Glib::build_filename (user_route_template_directory(), old_name);
+       const string new_state_dir = Glib::build_filename (user_route_template_directory(), new_name);
 
        if (adjusted) {
-               const string old_state_dir = Glib::build_filename (user_route_template_directory(), name);
-               const string new_state_dir = Glib::build_filename (user_route_template_directory(), new_name);
                if (g_rename (old_state_dir.c_str(), new_state_dir.c_str()) != 0) {
                        error << string_compose (_("Could not rename state dir \"%1\" to \"%22\": %3"), old_state_dir, new_state_dir, strerror (errno)) << endmsg;
                        return;
@@ -343,6 +344,9 @@ RouteTemplateManager::rename_template (TreeModel::iterator& item, const Glib::us
 
        if (!tree.write ()) {
                error << string_compose(_("Could not write new template file \"%1\"."), new_filepath) << endmsg;
+               if (adjusted) {
+                       g_rename (new_state_dir.c_str(), old_state_dir.c_str());
+               }
                return;
        }