Merge branch 'master' into develop

dotnet · Feb 21, 2017 · 64147f0 · 64147f0
2 parents 592e0ea + 072abb2
commit 64147f0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Ix.NET/Source/System.Interactive.Async/ToObservable.cs b/Ix.NET/Source/System.Interactive.Async/ToObservable.cs
@@ -119,7 +119,7 @@ public void OnCompleted()
 
                 if (tcs != null)
                 {
-                    tcs.SetResult(false);
+                    tcs.TrySetResult(false);
                 }
             }
 
@@ -140,7 +140,7 @@ public void OnError(Exception error)
 
                 if (tcs != null)
                 {
-                    tcs.SetException(error);
+                    tcs.TrySetException(error);
                 }
             }
 
@@ -165,7 +165,7 @@ public void OnNext(T value)
 
                 if (tcs != null)
                 {
-                    tcs.SetResult(true);
+                    tcs.TrySetResult(true);
                 }
             }
         }