Merge c0164f7 into 0718e04

ReactiveX · Jul 16, 2020 · 6ff076d · 6ff076d
2 parents 0718e04 + c0164f7
commit 6ff076d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/rx/core/operators/tofuture.py b/rx/core/operators/tofuture.py
@@ -42,10 +42,11 @@ def on_error(err):
 
         def on_completed():
             nonlocal last_value
-            if has_value:
-                future.set_result(last_value)
-            else:
-                future.set_exception(SequenceContainsNoElementsError())
+            if not future.cancelled():
+                if has_value:
+                    future.set_result(last_value)
+                else:
+                    future.set_exception(SequenceContainsNoElementsError())
             last_value = None
 
         source.subscribe_(on_next, on_error, on_completed, scheduler=scheduler)