f-spot r4286 - in trunk: . mono-addins/Mono.Addins/Mono.Addins

[rubenv svn gnome org]

Author: rubenv
Date: Wed Aug 20 19:01:43 2008
New Revision: 4286
URL: http://svn.gnome.org/viewvc/f-spot?rev=4286&view=rev

Log:
2008-08-20  Ruben Vermeersch  <ruben savanne be>

	* mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs: Do the correct
	fix, as suggested by lluis.


Modified:
   trunk/ChangeLog
   trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs
==============================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs	(original)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs	Wed Aug 20 19:01:43 2008
@@ -123,8 +123,6 @@
 				if (childrenLoaded)
 					return childNodes;
 				
-				childrenLoaded = true;
-				
 				try {
 					if (treeNode.Children.Count == 0) {
 						childNodes = ExtensionNodeList.Empty;
@@ -135,6 +133,8 @@
 					AddinManager.ReportError (null, null, ex, false);
 					childNodes = ExtensionNodeList.Empty;
 					return childNodes;
+				} finally {
+					childrenLoaded = true;
 				}
 
 				ArrayList list = new ArrayList ();
@@ -266,9 +266,6 @@
 			
 			bool changed = false;
 			
-			if (oldList == null)
-				return false;
-
 			foreach (ExtensionNode nod in oldList) {
 				if (ChildNodes [nod.Id] == null) {
 					changed = true;