Tidy up some is_candidate() methods.

[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / activepointsetoff.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp
index b1c7156..15bfe14 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp
@@ -99,22 +99,22 @@ Action::ActivepointSetOff::get_param_vocab()
 bool
 Action::ActivepointSetOff::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