Fix an issue where binding closure could be executed after disposing

DeclarativeHub · Oct 12, 2021 · 9821826 · 9821826
1 parent 224225f
commit 9821826
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/Sources/Bindable.swift b/Sources/Bindable.swift
@@ -104,11 +104,9 @@ extension SignalProtocol where Error == Never {
     /// - Returns: A disposable that can cancel the binding.
     @discardableResult
     public func bind<Target: Deallocatable>(to target: Target, context: ExecutionContext, setter: @escaping (Target, Element) -> Void) -> Disposable {
-        return prefix(untilOutputFrom: target.deallocated).observeNext { [weak target] element in
-            context.execute {
-                if let target = target {
-                    setter(target, element)
-                }
+        return prefix(untilOutputFrom: target.deallocated).receive(on: context).observeNext { [weak target] element in
+            if let target = target {
+                setter(target, element)
             }
         }
     }
@@ -188,11 +186,9 @@ extension SignalProtocol where Error == Never, Element == Void {
     /// - Returns: A disposable that can cancel the binding.
     @discardableResult
     public func bind<Target: Deallocatable>(to target: Target, context: ExecutionContext, setter: @escaping (Target) -> Void) -> Disposable {
-        return prefix(untilOutputFrom: target.deallocated).observeNext { [weak target] _ in
-            context.execute {
-                if let target = target {
-                    setter(target)
-                }
+        return prefix(untilOutputFrom: target.deallocated).receive(on: context).observeNext { [weak target] _ in
+            if let target = target {
+                setter(target)
             }
         }
     }