Merge pull request #1537 from Statsminizzle/bugfix/cancel_crash

Cancel moved to avoid crash
onevcat · Sep 29, 2020 · 9321758 · 9321758
2 parents e7f7599 + 96ed421
commit 9321758
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Sources/Networking/SessionDataTask.swift b/Sources/Networking/SessionDataTask.swift
@@ -101,9 +101,6 @@ public class SessionDataTask {
         guard let callback = removeCallback(token) else {
             return
         }
-        if callbacksStore.count == 0 {
-            task.cancel()
-        }
         onCallbackCancelled.call((token, callback))
     }
 

diff --git a/Sources/Networking/SessionDelegate.swift b/Sources/Networking/SessionDelegate.swift
@@ -73,6 +73,7 @@ class SessionDelegate: NSObject {
             // No other callbacks waiting, we can clear the task now.
             if !task.containsCallbacks {
                 let dataTask = task.task
+                dataTask.cancel()
                 self.remove(dataTask)
             }
         }