CorDebug Checking for aborted state in CorMethodCall

Author: nerzhulart

Mono.Debugging.Win32/CorMethodCall.cs

@@ -40,7 +40,12 @@ void DoProcessEvalFinished (CorEvalEventArgs evalArgs, bool isException)
 				return;
 			context.Session.OnEndEvaluating ();
 			evalArgs.Continue = false;
-			tcs.TrySetResult(new OperationResult<CorValue> (evalArgs.Eval.Result, isException));
+			if (aborted) {
+				tcs.TrySetCanceled ();
+			}
+			else {
+				tcs.TrySetResult(new OperationResult<CorValue> (evalArgs.Eval.Result, isException));
+			}
 		}
 
 		void SubscribeOnEvals ()
@@ -69,6 +74,7 @@ public override string Description
 		}
 
 		readonly TaskCompletionSource<OperationResult<CorValue>> tcs = new TaskCompletionSource<OperationResult<CorValue>> ();
+		bool aborted = false;
 		const int DelayAfterAbort = 500;
 
 		protected override void AfterCancelledImpl (int elapsedAfterCancelMs)
@@ -108,6 +114,7 @@ protected override Task<OperationResult<CorValue>> InvokeAsyncImpl (Cancellation
 		protected override void CancelImpl ( )
 		{
 			eval.Abort ();
+			aborted = true;
 		}
 	}
 }