Merge pull request neuecc#312 from sheepbeo/fix/ContinueWithException…

…Handling Add try catch block to handle exception when finishing ContinueWith
EarMaster · Jul 16, 2018 · 282c0dd · 282c0dd
2 parents bcaa1df + a036b72
commit 282c0dd
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/Operators/ContinueWith.cs b/Operators/ContinueWith.cs
@@ -56,9 +56,20 @@ public override void OnCompleted()
             {
                 if (seenValue)
                 {
-                    var v = parent.selector(lastValue);
-                    // dispose source subscription
-                    serialDisposable.Disposable = v.Subscribe(observer);
+                    try
+	                {
+		                var v = parent.selector(lastValue);
+		                // dispose source subscription
+		                serialDisposable.Disposable = v.Subscribe(observer);
+	                }
+	                catch (Exception error)
+	                {
+		                OnError(error);
+	                }
+	                finally
+	                {
+		                Dispose();
+	                }
                 }
                 else
                 {