X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistunloop.cpp;h=079be3a1d4a40690ba2f51866f0d5d2a7ab54ba9;hb=7c3682a6d1bb940fd74e9e327bbc2dd3a8fdb504;hp=ff3056f1de5d3c71f594d22665900528f824c6d0;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
index ff3056f..079be3a 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -78,21 +79,21 @@ Action::ValueNodeDynamicListUnLoop::get_param_vocab()
 bool
 Action::ValueNodeDynamicListUnLoop::is_candidate(const ParamList &x)
 {
-	if(candidate_check(get_param_vocab(),x))
-	{
-		ValueNode::Handle value_node;
-		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-		if(value_desc.parent_is_value_node())
-			value_node = value_desc.get_parent_value_node();
-		else
-			value_node = x.find("value_node")->second.get_value_node();
-		if(!ValueNode_DynamicList::Handle::cast_dynamic(value_node))
-			return false;
-		if(ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop()==false)
-			return false;
-		return true;
-	}
-	return false;
+	if (!candidate_check(get_param_vocab(),x))
+		return false;
+
+	ValueNode::Handle value_node;
+	ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+	if(value_desc.parent_is_value_node())
+		value_node = value_desc.get_parent_value_node();
+	else
+		value_node = x.find("value_node")->second.get_value_node();
+
+	// We need a dynamic list.
+	return (ValueNode_DynamicList::Handle::cast_dynamic(value_node) &&
+			// We need the list to be looped.
+			ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop());
 }
 
 bool