X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fwaypointremove.cpp;h=64bdcf65c77a609f7532b52e8fe8e59076c75ca3;hb=955793a73eff1191da57a4e3b3446f761c39e7e1;hp=cc5755b28448fdbc58dd0d0da89609a346626e96;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp
index cc5755b..64bdcf6 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp
@@ -32,6 +32,8 @@
 #include "waypointremove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -44,7 +46,7 @@ using namespace Action;
 
 ACTION_INIT(Action::WaypointRemove);
 ACTION_SET_NAME(Action::WaypointRemove,"waypoint_remove");
-ACTION_SET_LOCAL_NAME(Action::WaypointRemove,"Remove Waypoint");
+ACTION_SET_LOCAL_NAME(Action::WaypointRemove,N_("Remove Waypoint"));
 ACTION_SET_TASK(Action::WaypointRemove,"remove");
 ACTION_SET_CATEGORY(Action::WaypointRemove,Action::CATEGORY_WAYPOINT);
 ACTION_SET_PRIORITY(Action::WaypointRemove,0);
@@ -142,6 +144,10 @@ Action::WaypointRemove::perform()
 		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);