ios / yh_sdwebimage · Commits

Go to a project

Authored by Bogdan Poplauschi
Commit 9cd6779b4bf040ee29609c1e0a8553ec153581a1 1 parent b7325c09

Replaced #1537 - fixed a potential retain cycle in `SDWebImageManager`.

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
... ... @@ -168,7 +168,7 @@
// ignore image read from NSURLCache if image if cached but force refreshing
downloaderOptions |= SDWebImageDownloaderIgnoreCachedResponse;
}
id subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *downloadedData, NSError *error, BOOL finished) {
SDWebImageDownloadToken *subOperationToken = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *downloadedData, NSError *error, BOOL finished) {
__strong __typeof(weakOperation) strongOperation = weakOperation;
if (!strongOperation || strongOperation.isCancelled) {
// Do nothing if the operation was cancelled
... ... @@ -224,8 +224,9 @@
[self safelyRemoveOperationFromRunning:strongOperation];
}
}];
__weak typeof(subOperationToken)weakSubOperationToken = subOperationToken;
operation.cancelBlock = ^{
[self.imageDownloader cancel:subOperation];
[self.imageDownloader cancel:weakSubOperationToken];
__strong __typeof(weakOperation) strongOperation = weakOperation;
[self safelyRemoveOperationFromRunning:strongOperation];
};
... ...