Copy sublayers to avoid NSFastEnumerationMutation exception

sainttail · Mar 24, 2016 · a90a83b · a90a83b
1 parent 4ffaebc
commit a90a83b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h
@@ -351,7 +351,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** 
  * @abstract The receiver's immediate subnodes.
  */
-@property (nonatomic, readonly, strong) NSArray<ASDisplayNode *> *subnodes;
+@property (nonatomic, readonly, copy) NSArray<ASDisplayNode *> *subnodes;
 
 /** 
  * @abstract The receiver's supernode.

diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.mm b/AsyncDisplayKit/ASDisplayNodeExtras.mm
@@ -51,7 +51,9 @@ extern void ASDisplayNodePerformBlockOnEveryNode(CALayer *layer, ASDisplayNode *
  }
 
  if (layer) {
- for (CALayer *sublayer in [layer sublayers]) {
+ /// NOTE: The docs say `sublayers` returns a copy, but it does not.
+ /// See: http://stackoverflow.com/questions/14854480/collection-calayerarray-0x1ed8faa0-was-mutated-while-being-enumerated
+ for (CALayer *sublayer in [[layer sublayers] copy]) {
  ASDisplayNodePerformBlockOnEveryNode(sublayer, nil, block);
  }
  } else if (node) {