mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1348 from yirenjun/master 

Create a strong ref of weakOperation in the entry of The image downlo…
This commit is contained in:
Bogdan Poplauschi 2016-01-08 16:53:15 +02:00
parent 8aca4ca1b3 2b57abd44a
commit aa3598f3e0
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SDWebImage/SDWebImageManager.m
View File

@ -180,14 +180,15 @@
downloaderOptions |= SDWebImageDownloaderIgnoreCachedResponse; downloaderOptions |= SDWebImageDownloaderIgnoreCachedResponse;
} }
id <SDWebImageOperation> subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *data, NSError *error, BOOL finished) { id <SDWebImageOperation> subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *data, NSError *error, BOOL finished) {
if (weakOperation.isCancelled) { __strong __typeof(weakOperation) strongOperation = weakOperation;
if (!strongOperation || strongOperation.isCancelled) {
// Do nothing if the operation was cancelled // Do nothing if the operation was cancelled
// See #699 for more details // See #699 for more details
// if we would call the completedBlock, there could be a race condition between this block and another completedBlock for the same object, so if this one is called second, we will overwrite the new data // if we would call the completedBlock, there could be a race condition between this block and another completedBlock for the same object, so if this one is called second, we will overwrite the new data
} }
else if (error) { else if (error) {
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
if (!weakOperation.isCancelled) { if (strongOperation && !strongOperation.isCancelled) {
completedBlock(nil, error, SDImageCacheTypeNone, finished, url); completedBlock(nil, error, SDImageCacheTypeNone, finished, url);
} }
}); });
@ -226,7 +227,7 @@
} }
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
if (!weakOperation.isCancelled) { if (strongOperation && !strongOperation.isCancelled) {
completedBlock(transformedImage, nil, SDImageCacheTypeNone, finished, url); completedBlock(transformedImage, nil, SDImageCacheTypeNone, finished, url);
} }
}); });
@ -238,7 +239,7 @@
} }
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
if (!weakOperation.isCancelled) { if (strongOperation && !strongOperation.isCancelled) {
completedBlock(downloadedImage, nil, SDImageCacheTypeNone, finished, url); completedBlock(downloadedImage, nil, SDImageCacheTypeNone, finished, url);
} }
}); });
@ -247,7 +248,9 @@
if (finished) { if (finished) {
@synchronized (self.runningOperations) { @synchronized (self.runningOperations) {
[self.runningOperations removeObject:operation]; if (strongOperation) {
[self.runningOperations removeObject:strongOperation];
}
} }
} }
}]; }];
@ -255,13 +258,17 @@
[subOperation cancel]; [subOperation cancel];
@synchronized (self.runningOperations) { @synchronized (self.runningOperations) {
[self.runningOperations removeObject:weakOperation]; __strong __typeof(weakOperation) strongOperation = weakOperation;
if (strongOperation) {
[self.runningOperations removeObject:strongOperation];
}
} }
}; };
} }
else if (image) { else if (image) {
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
if (!weakOperation.isCancelled) { __strong __typeof(weakOperation) strongOperation = weakOperation;
if (strongOperation && !strongOperation.isCancelled) {
completedBlock(image, nil, cacheType, YES, url); completedBlock(image, nil, cacheType, YES, url);
} }
}); });
@ -272,7 +279,8 @@
else { else {
// Image not in cache and download disallowed by delegate // Image not in cache and download disallowed by delegate
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
if (!weakOperation.isCancelled) { __strong __typeof(weakOperation) strongOperation = weakOperation;
if (strongOperation && !weakOperation.isCancelled) {
completedBlock(nil, nil, SDImageCacheTypeNone, YES, url); completedBlock(nil, nil, SDImageCacheTypeNone, YES, url);
} }
}); });