ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-21 05:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASImageNode] -setDefaultImage: should release lock before calling -setImage:

Browse Source 
This allows -setImage: to fully unlock before it calls -invalidateCalculatedSize.
This commit is contained in:
Scott Goodson 2016-03-16 20:55:08 -07:00
parent 5f58b9d8af
commit a966b7b6a6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AsyncDisplayKit/ASNetworkImageNode.mm
View File

@ -132,15 +132,22 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
- (void)setDefaultImage:(UIImage *)defaultImage - (void)setDefaultImage:(UIImage *)defaultImage
{ {
ASDN::MutexLocker l(_lock); _lock.lock();
if (ASObjectIsEqual(defaultImage, _defaultImage)) { if (ASObjectIsEqual(defaultImage, _defaultImage)) {
_lock.unlock();
return; return;
} }
_defaultImage = defaultImage; _defaultImage = defaultImage;
if (!_imageLoaded) { if (!_imageLoaded) {
self.image = _defaultImage; _lock.unlock();
// Locking: it is important to release _lock before entering setImage:, as it needs to release the lock before -invalidateCalculatedLayout.
// If we continue to hold the lock here, it will still be locked until the next unlock() call, causing a possible deadlock with
// -[ASNetworkImageNode displayWillStart] (which is called on a different thread / main, at an unpredictable time due to ASMainRunloopQueue).
self.image = defaultImage;
} else {
_lock.unlock();
} }
} }