From 6e2236c9486cf2184b78c7c12e3b899aec7fcbc5 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 15 Sep 2016 12:15:46 -0700 Subject: [PATCH] =?UTF-8?q?Make=20a=20test=20change=20=E2=80=93=20will=20n?= =?UTF-8?q?ot=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm index f758dfb8..dc642e07 100644 --- a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm +++ b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm @@ -290,6 +290,7 @@ // This block is called back on the main thread after rendering at the completion of the current async transaction, or immediately if !asynchronously asyncdisplaykit_async_transaction_operation_completion_block_t completionBlock = ^(id value, BOOL canceled){ ASDisplayNodeCAssertMainThread(); + if (!canceled && !isCancelledBlock()) { UIImage *image = (UIImage *)value; BOOL stretchable = (NO == UIEdgeInsetsEqualToEdgeInsets(image.capInsets, UIEdgeInsetsZero));