From 437c16829bc577b6ae698d7f8c9e6344c9999157 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 27 Feb 2011 21:53:05 -0500 Subject: [PATCH] Filter out the CLASSNAME property so that the condition to request more children is met all the time. --- CHANGES | 5 +++++ Source/VariableNode.m | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index e809efc..226579d 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,11 @@ MacGDBp CHANGE LOG breakpoint +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 8d2387a..5e38c07 100644 --- 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]; -- 2.43.5