Filter out the CLASSNAME property so that the condition to request more children...

diff --git a/CHANGES b/CHANGES
index 32a63df97d15a0b15e3c1be8fdc64a832c10e8ea..a272520d8d377e5ce8da7f9d0047e2024aecbd08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 MacGDBp                                                               CHANGE LOG
 ================================================================================
 
+1.4.1
+#####################
+- Fix: Objects with nested objects wouldn't always load their child keys
+
+
 1.4 Beta 2
 #####################
 - Fix: After clicking on a stack frame with a virtual file, the debugger front

diff --git a/Source/VariableNode.m b/Source/VariableNode.m
index 8d2387a698c5717e0d92c984d557d43f5df198a0..5e38c07707f4e26b945360a66eb3633b268f45e0 100644 (file)
--- a/Source/VariableNode.m
+++ b/Source/VariableNode.m
@@ -82,7 +82,11 @@
     // Other child nodes may be the string value.
     if ([child isKindOfClass:[NSXMLElement class]]) {
       VariableNode* node = [[VariableNode alloc] initWithXMLNode:(NSXMLElement*)child];
-      [children_ addObject:[node autorelease]];
+      // Don't include the CLASSNAME property as that information is retreeived
+      // elsewhere.
+      if (![node.name isEqualToString:@"CLASSNAME"])
+        [children_ addObject:node];
+      [node release];
     }
   }
 }
@@ -90,7 +94,7 @@
 - (NSArray*)dynamicChildren
 {
   NSArray* children = self.children;
-  if (![self isLeaf] && [children count] < 1) {
+  if (![self isLeaf] && (NSInteger)[children count] < self.childCount) {
     // If this node has children but they haven't been loaded from the backend,
     // request them asynchronously.
     [[AppDelegate instance].debugger fetchChildProperties:self];