X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistremovesmart.cpp;h=6bd7a90e479fb44b4d3d023268874c39b07b012b;hb=2b7a4f046ad70e394d392496fb34a448b94f1d92;hp=e7b315c4002a5667a99a43217ab04d92206e2c24;hpb=c1f365570ac471ede0668ad976fad345747aa8de;p=synfig.git

diff --git a/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp b/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
index e7b315c..6bd7a90 100644
--- a/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
+++ b/synfig-studio/tags/stable/src/synfigapp/actions/valuenodedynamiclistremovesmart.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
@@ -91,15 +92,14 @@ Action::ValueNodeDynamicListRemoveSmart::get_param_vocab()
 bool
 Action::ValueNodeDynamicListRemoveSmart::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;
 
-		return true;
-	}
-	return false;
+	ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+	return (value_desc.parent_is_value_node() &&
+			// We need a dynamic list.
+			ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()));
 }
 
 bool