From c9d53517fad051b6ad6989048d006bd7b86e2e82 Mon Sep 17 00:00:00 2001
From: Adlai Holler <guy.on.internet@icloud.com>
Date: Thu, 7 Jan 2016 23:48:10 -0800
Subject: [PATCH] Lock node's properties while pending view state is applied

---
 AsyncDisplayKit/ASDisplayNode.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
index fce8cd2198..0b2f6de2b0 100644
--- a/AsyncDisplayKit/ASDisplayNode.mm
+++ b/AsyncDisplayKit/ASDisplayNode.mm
@@ -985,6 +985,7 @@ static inline void filterNodesInLayoutAtIndexesWithIntersectingNodes(
 - (void)applyPendingViewState
 {
   ASDisplayNodeAssertMainThread();
+  ASDN::MutexLocker l(_propertyLock);
   if (self.layerBacked) {
     [_pendingViewState applyToLayer:self.layer];
   } else {