Make sure that legacy API continues setting state on the callback queue

kean · May 7, 2024 · c2720dc · c2720dc
1 parent 37a9b70
commit c2720dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Sources/Nuke/ImageTask.swift b/Sources/Nuke/ImageTask.swift
@@ -224,10 +224,12 @@ public final class ImageTask: Hashable, CustomStringConvertible, @unchecked Send
     }
 
     /// Synchronized on `pipeline.queue`.
-    private func _setState(_ state: State) -> Bool {
+    func _setState(_ state: State) -> Bool {
         guard _state == .running else { return false }
         _state = state
-        withLock { $0.state = state }
+        if onEvent == nil {
+            withLock { $0.state = state }
+        }
         return true
     }
 

diff --git a/Sources/Nuke/Pipeline/ImagePipeline.swift b/Sources/Nuke/Pipeline/ImagePipeline.swift
@@ -217,7 +217,9 @@ public final class ImagePipeline: @unchecked Sendable {
                 case .progress(let value): progress?(nil, value)
                 case .preview(let response): progress?(response, task.currentProgress)
                 case .cancelled: break // The legacy APIs do not send cancellation events
-                case .finished(let result): completion(result)
+                case .finished(let result):
+                    _ = task._setState(.completed) // Important to do it on the callback queue
+                    completion(result)
                 }
             }
         }