X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fwaypointadd.cpp;h=f0809103a09fea193de9a9b83569efea1b35f166;hb=21b7221174dff900ae2f2bc2dd5987c717bab9a3;hp=3354c8c9b89a30b3118058394dc26a3ec1d5b421;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
index 3354c8c..f080910 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
@@ -33,6 +33,8 @@
 #include <synfigapp/canvasinterface.h>
 #include <synfigapp/main.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -45,7 +47,7 @@ using namespace Action;
 
 ACTION_INIT(Action::WaypointAdd);
 ACTION_SET_NAME(Action::WaypointAdd,"waypoint_add");
-ACTION_SET_LOCAL_NAME(Action::WaypointAdd,"Add Waypoint");
+ACTION_SET_LOCAL_NAME(Action::WaypointAdd,N_("Add Waypoint"));
 ACTION_SET_TASK(Action::WaypointAdd,"add");
 ACTION_SET_CATEGORY(Action::WaypointAdd,Action::CATEGORY_WAYPOINT);
 ACTION_SET_PRIORITY(Action::WaypointAdd,0);
@@ -92,16 +94,11 @@ Action::WaypointAdd::get_param_vocab()
 bool
 Action::WaypointAdd::is_candidate(const ParamList &x)
 {
-	if(candidate_check(get_param_vocab(),x))
-	{
-		if(!ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node()))
-			return false;
-
-		// We need either a waypoint or a time.
-		if(x.count("waypoint") || x.count("time"))
-			return true;
-	}
-	return false;
+	return (candidate_check(get_param_vocab(),x) &&
+			// We need an animated valuenode.
+			ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node()) &&
+			// We need either a waypoint or a time.
+			(x.count("waypoint") || x.count("time")));
 }
 
 bool