From 541f3a12847e4fad93003a24b1d3217c36a19f4b Mon Sep 17 00:00:00 2001
From: Olivier Poitrey <rs@dailymotion.com>
Date: Tue, 6 Nov 2012 14:04:12 +0100
Subject: [PATCH] Fix cancel not cancelling connection

---
 SDWebImage/SDWebImageDownloader.m | 5 ++---
 SDWebImage/SDWebImageManager.m    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/SDWebImage/SDWebImageDownloader.m b/SDWebImage/SDWebImageDownloader.m
index e98965c7..40617ce0 100644
--- a/SDWebImage/SDWebImageDownloader.m
+++ b/SDWebImage/SDWebImageDownloader.m
@@ -91,7 +91,7 @@ NSString *const kCompletedCallbackKey = @"completed";
     return _downloadQueue.maxConcurrentOperationCount;
 }
 
-- (NSOperation *)downloadImageWithURL:(NSURL *)url options:(SDWebImageDownloaderOptions)options progress:(void (^)(NSUInteger, long long))progressBlock completed:(void (^)(UIImage *, NSError *, BOOL))completedBlock
+- (id<SDWebImageOperation>)downloadImageWithURL:(NSURL *)url options:(SDWebImageDownloaderOptions)options progress:(void (^)(NSUInteger, long long))progressBlock completed:(void (^)(UIImage *, NSError *, BOOL))completedBlock
 {
     __block SDWebImageDownloaderOperation *operation;
     __weak SDWebImageDownloader *wself = self;
@@ -134,13 +134,12 @@ NSString *const kCompletedCallbackKey = @"completed";
         [self.downloadQueue addOperation:operation];
     }];
 
-
     return operation;
 }
 
 - (void)addProgressCallback:(void (^)(NSUInteger, long long))progressBlock andCompletedBlock:(void (^)(UIImage *, NSError *, BOOL))completedBlock forURL:(NSURL *)url createCallback:(void (^)())createCallback
 {
-    dispatch_barrier_async(self.barrierQueue, ^
+    dispatch_barrier_sync(self.barrierQueue, ^
     {
         BOOL first = NO;
         if (!self.URLCallbacks[url])
diff --git a/SDWebImage/SDWebImageManager.m b/SDWebImage/SDWebImageManager.m
index 03ac5851..11b8bf26 100644
--- a/SDWebImage/SDWebImageManager.m
+++ b/SDWebImage/SDWebImageManager.m
@@ -97,7 +97,7 @@
             SDWebImageDownloaderOptions downloaderOptions = 0;
             if (options & SDWebImageLowPriority) downloaderOptions |= SDWebImageDownloaderLowPriority;
             if (options & SDWebImageProgressiveDownload) downloaderOptions |= SDWebImageDownloaderProgressiveDownload;
-            id<SDWebImageOperation> subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSError *error, BOOL finished)
+            __block id<SDWebImageOperation> subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSError *error, BOOL finished)
             {
                 dispatch_async(dispatch_get_main_queue(), ^
                 {