From 6741ae658eec07dceb477cf84669692e668d88a7 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Thu, 14 Jan 2016 23:28:15 -0800 Subject: [PATCH] [ASCellNode] Ensure we don't trigger the UIViewController to be created early if we are wrapping one. --- AsyncDisplayKit/ASCellNode.m | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.m b/AsyncDisplayKit/ASCellNode.m index 575200df..df7040d9 100644 --- a/AsyncDisplayKit/ASCellNode.m +++ b/AsyncDisplayKit/ASCellNode.m @@ -20,7 +20,6 @@ @interface ASCellNode () { - ASDisplayNodeDidLoadBlock _nodeLoadedBlock; UIViewController *_viewController; ASDisplayNode *_viewControllerNode; } @@ -49,15 +48,13 @@ ASDisplayNodeAssertNotNil(viewControllerBlock, @"should initialize with a valid block that returns a UIViewController"); if (viewControllerBlock) { - _viewController = viewControllerBlock(); - __weak UIViewController *weakViewController = _viewController; _viewControllerNode = [[ASDisplayNode alloc] initWithViewBlock:^UIView *{ - return weakViewController.view; + _viewController = viewControllerBlock(); + return _viewController.view; } didLoadBlock:didLoadBlock]; [self addSubnode:_viewControllerNode]; - _nodeLoadedBlock = didLoadBlock; } return self;