X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=299472ba2b63be87213e20b6da2c144e5af67633;hb=6fcfeb5b77c28b403b9fecc9bafcde6834447c9a;hp=645895cecdfabc4b98b0a267c1b03289b625d4ee;hpb=6c27d1b6cf4694a873542cb264c650893f2c6e0e;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 645895c..299472b 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -352,7 +352,7 @@ xmlpp::Element* encode_composite(xmlpp::Element* root,ValueNode_Composite::Const
 	int i;
 	for(i=0;i<value_node->link_count();i++)
 	{
-		string name(strprintf("c%d",i+1));
+		string name(value_node->link_name(i));
 		assert(value_node->get_link(i));
 		if(value_node->get_link(i)->is_exported())
 			root->set_attribute(name,value_node->get_link(i)->get_relative_id(canvas));
@@ -705,7 +705,8 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
 	}
 
 	// Output the <defs> section
-	if(!canvas->is_inline() && !canvas->value_node_list().empty() || !canvas->children().empty())
+	//! \todo check where the parentheses should really go - around the && or the ||?
+	if((!canvas->is_inline() && !canvas->value_node_list().empty()) || !canvas->children().empty())
 	{
 		xmlpp::Element *node=root->add_child("defs");
 		const ValueNodeList &value_node_list(canvas->value_node_list());