TouchInstinct
/
SDWebImage
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to fix the thread block (#399)

This commit is contained in:
Olivier Poitrey 2013-08-08 12:44:54 -07:00
parent 1e63f33a85
commit 5dd219ffa7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SDWebImage/SDWebImageDownloader.m
View File

@ -111,7 +111,7 @@ static NSString *const kCompletedCallbackKey = @"completed";
- (id<SDWebImageOperation>)downloadImageWithURL:(NSURL *)url options:(SDWebImageDownloaderOptions)options progress:(void (^)(NSUInteger, long long))progressBlock completed:(void (^)(UIImage *, NSData *, NSError *, BOOL))completedBlock
{
__block SDWebImageDownloaderOperation *blockOperation;
__block SDWebImageDownloaderOperation *operation;
__weak SDWebImageDownloader *wself = self;
[self addProgressCallback:progressBlock andCompletedBlock:completedBlock forURL:url createCallback:^
@ -121,7 +121,7 @@ static NSString *const kCompletedCallbackKey = @"completed";
request.HTTPShouldHandleCookies = NO;
request.HTTPShouldUsePipelining = YES;
request.allHTTPHeaderFields = wself.HTTPHeaders;
blockOperation = [SDWebImageDownloaderOperation.alloc initWithRequest:request options:options progress:^(NSUInteger receivedSize, long long expectedSize)
operation = [SDWebImageDownloaderOperation.alloc initWithRequest:request options:options progress:^(NSUInteger receivedSize, long long expectedSize)
{
if (!wself) return;
SDWebImageDownloader *sself = wself;
@ -153,17 +153,15 @@ static NSString *const kCompletedCallbackKey = @"completed";
SDWebImageDownloader *sself = wself;
[sself removeCallbacksForURL:url];
}];
[wself.downloadQueue addOperation:blockOperation];
[wself.downloadQueue addOperation:operation];
if (wself.executionOrder == SDWebImageDownloaderLIFOExecutionOrder)
{
// Emulate LIFO execution order by systematically adding new operations as last operation's dependency
[wself.lastAddedOperation addDependency:blockOperation];
wself.lastAddedOperation = blockOperation;
[wself.lastAddedOperation addDependency:operation];
wself.lastAddedOperation = operation;
}
}];
id operation = blockOperation;
blockOperation = nil; // break retain cycle
return operation;
}