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

Use deep compare when setting image identifiers in ASMultiplexImageNode #713

Merged
merged 2 commits into from
Oct 6, 2015
Merged

Use deep compare when setting image identifiers in ASMultiplexImageNode #713

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5b5bdd
Use deep compare when setting image identifiers in ASMultiplexImageNode
Adlai-Holler Oct 6, 2015
ce97b56
Sugar
Adlai-Holler Oct 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AsyncDisplayKit/ASMultiplexImageNode.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ - (void)setImageIdentifiers:(NSArray *)imageIdentifiers
{
OSSpinLockLock(&_imageIdentifiersLock);

if (_imageIdentifiers == imageIdentifiers) {
if ([_imageIdentifiers isEqual:imageIdentifiers]) {
OSSpinLockUnlock(&_imageIdentifiersLock);
return;
}
Expand Down Expand Up @@ -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;
Expand Down