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

Remove the template description XMLNode before saving the template 

... to avoid that the new template description is concatenated to the old one.
This commit is contained in:
Johannes Mueller 2017-08-19 19:45:08 +02:00 committed by Robin Gareus
parent 419b1c1cfd
commit bd4db1e151
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/template_dialog.cc
View File

@ -256,14 +256,14 @@ TemplateManager::save_template_desc ()
return;
}
XMLNode* desc = tree.root()->child (X_("description"));
if (!desc) {
desc = new XMLNode (X_("description"));
tree.root()->add_child_nocopy (*desc);
}
tree.root()->remove_nodes (X_("description"));
XMLNode* desc = new XMLNode (X_("description"));
XMLNode* dn = new XMLNode (X_("content"), desc_txt);
desc->add_child_nocopy (*dn);
tree.root()->add_child_nocopy (*desc);
if (!tree.write ()) {
error << string_compose(X_("Could not write to template file \"%1\"."), file_path) << endmsg;
return;

1
libs/ardour/route.cc
View File

@ -4022,6 +4022,7 @@ Route::save_as_template (const string& path, const string& name, const string& d
XMLNode& node (state (false));
node.set_property (X_("name"), name);
node.remove_nodes (X_("description"));
if (!description.empty()) {
XMLNode* desc = new XMLNode(X_("description"));
XMLNode* desc_cont = new XMLNode(X_("content"), description);

7
libs/ardour/session_state.cc
View File

@ -2414,12 +2414,13 @@ Session::save_template (const string& template_name, const string& description,
XMLNode* root;
{
PBD::Unwinder<std::string> uw (_template_state_dir, template_dir_path);
root = &get_template();
root = &get_template ();
}
root->remove_nodes (X_("description"));
if (!description.empty()) {
XMLNode* desc = new XMLNode(X_("description"));
XMLNode* desc_cont = new XMLNode(X_("content"), description);
XMLNode* desc = new XMLNode (X_("description"));
XMLNode* desc_cont = new XMLNode (X_("content"), description);
desc->add_child_nocopy (*desc_cont);
root->add_child_nocopy (*desc);