X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fwaypointadd.cpp;h=f0809103a09fea193de9a9b83569efea1b35f166;hb=0f6cbbaa466e8da2ac71586793015854d27f72be;hp=8912b3a594a27386fbac15fbc6cbda5c884d041d;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
index 8912b3a..f080910 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
@@ -94,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