X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fwaypointremove.cpp;h=4374cdc9fd8c2136e836a0a1e0eef12c0b038ae6;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=64bdcf65c77a609f7532b52e8fe8e59076c75ca3;hpb=9d93930f1448d65494b8b4625635f7d14e678804;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp
index 64bdcf6..4374cdc 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp
@@ -45,7 +45,7 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::WaypointRemove);
-ACTION_SET_NAME(Action::WaypointRemove,"waypoint_remove");
+ACTION_SET_NAME(Action::WaypointRemove,"WaypointRemove");
 ACTION_SET_LOCAL_NAME(Action::WaypointRemove,N_("Remove Waypoint"));
 ACTION_SET_TASK(Action::WaypointRemove,"remove");
 ACTION_SET_CATEGORY(Action::WaypointRemove,Action::CATEGORY_WAYPOINT);
@@ -141,13 +141,19 @@ Action::WaypointRemove::perform()
 				throw Error(_("Unable to create ValueNode_Reference"));
 		}
 
+		// fix 2256600 (and 2321845) : deleting the last waypoint of an exported valuenode unexported it
+		// if the waypoint's value isn't exported, set its id to be the id of the parent node
+		if (value_node_ref->get_id() == "" && value_node->get_id() != "")
+		{
+			const String id(value_node->get_id());
+			Canvas::LooseHandle canvas(value_node->get_parent_canvas());
+			canvas->remove_value_node(value_node);
+			canvas->add_value_node(value_node_ref, id);
+		}
+
 		value_node->replace(value_node_ref);
 		value_node->waypoint_list().clear();
 
-		// fix 2256600 : deleting the last waypoint of an exported valuenode unexported it
-		// if the waypoint's value isn't exported, set its id to be the id of the parent node
-		if (value_node_ref->get_id() == "") value_node_ref->set_id(value_node->get_id());
-
 		if(get_canvas_interface())
 		{
 			get_canvas_interface()->signal_value_node_replaced()(value_node,value_node_ref);
@@ -165,6 +171,14 @@ Action::WaypointRemove::undo()
 		if(value_node->waypoint_list().size()!=0)
 			throw Error(_("This animated value node should be empty, but for some reason it isn't. This is a bug. (1)"));
 
+		if (value_node->get_id() == "" && value_node_ref->get_id() != "")
+		{
+			const String id(value_node_ref->get_id());
+			Canvas::LooseHandle canvas(value_node_ref->get_parent_canvas());
+			canvas->remove_value_node(value_node_ref);
+			canvas->add_value_node(value_node, id);
+		}
+
 		value_node_ref->replace(value_node);
 
 		waypoint.set_value_node(value_node_ref);