From c5b5bdd29c057268a9a51c60742f9b8e0a8ba450 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Mon, 5 Oct 2015 20:34:42 -0700 Subject: [PATCH 1/2] Use deep compare when setting image identifiers in ASMultiplexImageNode --- AsyncDisplayKit/ASMultiplexImageNode.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASMultiplexImageNode.mm b/AsyncDisplayKit/ASMultiplexImageNode.mm index 4ffb8a1275..7048de4e73 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.mm +++ b/AsyncDisplayKit/ASMultiplexImageNode.mm @@ -268,7 +268,7 @@ - (void)setImageIdentifiers:(NSArray *)imageIdentifiers { OSSpinLockLock(&_imageIdentifiersLock); - if (_imageIdentifiers == imageIdentifiers) { + if ([_imageIdentifiers isEqual:imageIdentifiers]) { OSSpinLockUnlock(&_imageIdentifiersLock); return; } From ce97b56580eeba6c592d0b9bae64c815cdaa20b9 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Mon, 5 Oct 2015 20:41:21 -0700 Subject: [PATCH 2/2] Sugar --- AsyncDisplayKit/ASMultiplexImageNode.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASMultiplexImageNode.mm b/AsyncDisplayKit/ASMultiplexImageNode.mm index 7048de4e73..3d26fc0610 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.mm +++ b/AsyncDisplayKit/ASMultiplexImageNode.mm @@ -372,7 +372,7 @@ - (id)_nextImageIdentifierToDownload OSSpinLockLock(&_imageIdentifiersLock); // If we've already loaded the best identifier, we've got nothing else to do. - id bestImageIdentifier = ([_imageIdentifiers count] > 0) ? _imageIdentifiers[0] : nil; + id bestImageIdentifier = _imageIdentifiers.firstObject; if (!bestImageIdentifier || [_loadedImageIdentifier isEqual:bestImageIdentifier]) { OSSpinLockUnlock(&_imageIdentifiersLock); return nil;