Merge pull request #1350 from onevcat/fix/gif-repeat-count

Fix wrong repeatCount calculation in AnimatedImageView
onevcat · Nov 17, 2019 · a33995f · a33995f
2 parents e951bc2 + 4c848a0
commit a33995f
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/Sources/Views/AnimatedImageView.swift b/Sources/Views/AnimatedImageView.swift
@@ -31,8 +31,6 @@
 //  The name and characters used in the demo of this software are property of their
 //  respective owners.
 
-#if !os(watchOS)
-
 #if canImport(UIKit)
 import UIKit
 import ImageIO
@@ -534,10 +532,11 @@ extension AnimatedImageView {
 
         private func incrementCurrentFrameIndex() {
             currentFrameIndex = increment(frameIndex: currentFrameIndex)
-            if isReachMaxRepeatCount && isLastFrame {
-                isFinished = true
-            } else if currentFrameIndex == 0 {
+            if isLastFrame {
                 currentRepeatCount += 1
+                if isReachMaxRepeatCount {
+                    isFinished = true
+                }
                 delegate?.animator(self, didPlayAnimationLoops: currentRepeatCount)
             }
         }
@@ -612,5 +611,3 @@ class SafeArray<Element> {
     }
 }
 #endif
-
-#endif