Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit 2e5da55

Browse files
committed
Merge pull request #713 from Adlai-Holler/MultiplexImageNodeShortCircuit
Use deep compare when setting image identifiers in ASMultiplexImageNode
2 parents 00e993c + ce97b56 commit 2e5da55

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

AsyncDisplayKit/ASMultiplexImageNode.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ - (void)setImageIdentifiers:(NSArray *)imageIdentifiers
268268
{
269269
OSSpinLockLock(&_imageIdentifiersLock);
270270

271-
if (_imageIdentifiers == imageIdentifiers) {
271+
if ([_imageIdentifiers isEqual:imageIdentifiers]) {
272272
OSSpinLockUnlock(&_imageIdentifiersLock);
273273
return;
274274
}
@@ -372,7 +372,7 @@ - (id)_nextImageIdentifierToDownload
372372
OSSpinLockLock(&_imageIdentifiersLock);
373373

374374
// If we've already loaded the best identifier, we've got nothing else to do.
375-
id bestImageIdentifier = ([_imageIdentifiers count] > 0) ? _imageIdentifiers[0] : nil;
375+
id bestImageIdentifier = _imageIdentifiers.firstObject;
376376
if (!bestImageIdentifier || [_loadedImageIdentifier isEqual:bestImageIdentifier]) {
377377
OSSpinLockUnlock(&_imageIdentifiersLock);
378378
return nil;

0 commit comments

Comments
 (0)