Nil completion block when animations are removed to fix memory leak […

…common]
cbpowell · Sep 10, 2016 · 7ac46e8 · 7ac46e8
1 parent b97ec74
commit 7ac46e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Sources/ObjC/MarqueeLabel.m b/Sources/ObjC/MarqueeLabel.m
@@ -35,7 +35,7 @@ - (NSArray *)controlPoints;
 - (CGFloat)durationPercentageForPositionPercentage:(CGFloat)positionPercentage withDuration:(NSTimeInterval)duration;
 @end
 
-@interface MarqueeLabel()
+@interface MarqueeLabel() <CAAnimationDelegate>
 
 @property (nonatomic, strong) UILabel *subLabel;
 
@@ -525,6 +525,9 @@ - (void)returnLabelToOriginImmediately {
 
     // Remove sublabel position animations
     [self.subLabel.layer removeAllAnimations];
+
+    // Remove compeltion blocks
+    self.scrollCompletionBlock = nil;
 }
 
 - (void)scrollAwayWithInterval:(NSTimeInterval)interval {

diff --git a/Sources/Swift/MarqueeLabel.swift b/Sources/Swift/MarqueeLabel.swift
@@ -727,6 +727,9 @@ public class MarqueeLabel: UILabel {
 
         // Remove all sublabel position animations
         sublabel.layer.removeAllAnimations()
+
+        // Remove completion block
+        scrollCompletionBlock = nil
     }
 
     private func scroll(interval: CGFloat, delay: CGFloat = 0.0, scroller: Scroller, fader: CAKeyframeAnimation?) {