X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointseton.cpp;fp=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointseton.cpp;h=217eb8a1cd3efacad55191bfdd6bcb94dfeb7c23;hb=fcf1f2a99d715f39ca71469145d286d74a8af159;hp=3f48f05952b883430ab256942ec89bbbb3b7108d;hpb=b054a4463e94169b6d119191000b8485cf7fa853;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp
index 3f48f05..217eb8a 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp
@@ -99,22 +99,22 @@ Action::ActivepointSetOn::get_param_vocab()
 bool
 Action::ActivepointSetOn::is_candidate(const ParamList &x)
 {
-	if(candidate_check(get_param_vocab(),x))
-	{
-		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-		if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()))
-			return false;
+	if (!candidate_check(get_param_vocab(),x))
+		return false;
 
-		// We are only a candidate if this canvas is animated.
-		Canvas::Handle canvas(x.find("canvas")->second.get_canvas());
-		if(canvas->rend_desc().get_time_start()==canvas->rend_desc().get_time_end())
-			return false;
+	ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
 
-		// We need either a activepoint or a time.
-		if(x.count("activepoint") || x.count("time"))
-			return true;
-	}
-	return false;
+	if (!(value_desc.parent_is_value_node() &&
+		  // We need a dynamic list.
+		  ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())))
+		return false;
+
+	Canvas::Handle canvas(x.find("canvas")->second.get_canvas());
+
+	// We are only a candidate if this canvas is animated.
+	return (canvas->rend_desc().get_time_start() != canvas->rend_desc().get_time_end() &&
+			// We need either an activepoint or a time.
+			(x.count("activepoint") || x.count("time")));
 }
 
 bool