Fixed SDWebImageCombinedOperation cancel crash (#798 #809)

SDWebImage · Jul 21, 2014 · 28109c4 · 28109c4
1 parent c8df858
commit 28109c4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/SDWebImage/SDWebImageManager.m b/SDWebImage/SDWebImageManager.m
@@ -298,10 +298,13 @@ - (BOOL)isRunning {
 @implementation SDWebImageCombinedOperation
 
 - (void)setCancelBlock:(SDWebImageNoParamsBlock)cancelBlock {
+    // check if the operation is already cancelled, then we just call the cancelBlock
     if (self.isCancelled) {
-        if (cancelBlock) cancelBlock();
-    }
-    else {
+        if (cancelBlock) {
+            cancelBlock();
+        }
+        _cancelBlock = nil; // don't forget to nil the cancelBlock, otherwise we will get crashes
+    } else {
         _cancelBlock = [cancelBlock copy];
     }
 }