Update weak references

leverdeterre · Oct 1, 2014 · 5732305 · 5732305
1 parent 9ea9503
commit 5732305
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 24 deletions.
diff --git a/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedGifImageView.m b/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedGifImageView.m
@@ -65,29 +65,31 @@ - (void)moveCurrentCardImageFromIndex:(NSInteger)fromIndex
 
         for (int i = 0; i < (int)abs((int)shift) ; i++) {
 
-                NSInteger index = [self realIndexForComputedIndex:fromIndex+i*shiftUnit];
-                JMGifItem *item = [[self.gifObject items] objectAtIndex:index];
+            NSInteger index = [self realIndexForComputedIndex:fromIndex+i*shiftUnit];
+            JMGifItem *item = [[self.gifObject items] objectAtIndex:index];
 
-                JMAnimationOperation *operation = [JMAnimationOperation animationOperationWithDuration:item.delayDuration
-                                                                                            completion:^(BOOL finished)
-                                                   {
-
-                                                       if (self.animationType == JMAnimatedImageViewAnimationTypeAutomaticLinearWithoutTransition) {
-                                                           if ([self operationQueueIsFinished] == YES) {
-                                                               if (finishBlock) {
-                                                                   finishBlock(YES);
-                                                               }
-
-                                                               if (self.animationRepeatCount == 0 && self.animationState == UIImageViewAnimationStateInPgrogress) {
-                                                                   [self continueAnimating];
-                                                               }
+            __weak JMAnimatedGifImageView *weaSelf = self;
+            JMAnimationOperation *operation = [JMAnimationOperation animationOperationWithDuration:item.delayDuration
+                                                                                        completion:^(BOOL finished)
+                                               {
+
+                                                   if (weaSelf.animationType == JMAnimatedImageViewAnimationTypeAutomaticLinearWithoutTransition) {
+                                                       if ([weaSelf operationQueueIsFinished] == YES) {
+                                                           if (finishBlock) {
+                                                               finishBlock(YES);
+                                                           }
+
+                                                           if (weaSelf.animationRepeatCount == 0 &&
+                                                               weaSelf.animationState == UIImageViewAnimationStateInPgrogress) {
+                                                               [weaSelf continueAnimating];
                                                            }
                                                        }
-                                                   }];
-
-                operation.animatedImageView = self;
-                operation.imageIndex = index;                
-                [self.animationQueue addOperation:operation];
+                                                   }
+                                               }];
+
+            operation.animatedImageView = self;
+            operation.imageIndex = index;
+            [self.animationQueue addOperation:operation];
         }
     });
 }

diff --git a/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedImageView.m b/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedImageView/JMAnimatedImageView.m
@@ -369,19 +369,23 @@ - (void)moveCurrentCardImageFromIndex:(NSInteger)fromIndex
                 continue;
 
             } else {
+
                 NSInteger index = [self realIndexForComputedIndex:fromIndex+i*shiftUnit];
+                __weak JMAnimatedImageView *weaSelf = self;
+
                 JMAnimationOperation *operation = [JMAnimationOperation animationOperationWithDuration:currentInterval
                                                                                             completion:^(BOOL finished)
                 {
 
-                    if (self.animationType == JMAnimatedImageViewAnimationTypeAutomaticLinearWithoutTransition) {
-                        if ([self operationQueueIsFinished] == YES) {
+                    if (weaSelf.animationType == JMAnimatedImageViewAnimationTypeAutomaticLinearWithoutTransition) {
+                        if ([weaSelf operationQueueIsFinished] == YES) {
                             if (finishBlock) {
                                 finishBlock(YES);
                             }
 
-                            if (self.animationRepeatCount == 0 && self.animationState == UIImageViewAnimationStateInPgrogress) {
-                               [self continueAnimating];
+                            if (weaSelf.animationRepeatCount == 0 &&
+                                weaSelf.animationState == UIImageViewAnimationStateInPgrogress) {
+                               [weaSelf continueAnimating];
                             }
                         }
                     }