From 320896e50ed3d05c5e8b1bb8ebc288f335a93f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Srbeck=C3=BD?= <dsrbecky@gmail.com>
Date: Tue, 8 Dec 2009 19:49:47 +0000
Subject: [PATCH] Backported r5302 - Fixed rude-abort of evals

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5318 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
index b34433a5bd..d51254e912 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
@@ -162,7 +162,6 @@ namespace Debugger
 			try {
 				process.WaitForPause(TimeSpan.FromMilliseconds(500));
 				if (!Evaluated) {
-					state = EvalState.EvaluatedTimeOut;
 					process.TraceMessage("Aboring eval: " + Description);
 					corEval.Abort();
 					process.WaitForPause(TimeSpan.FromMilliseconds(500));
@@ -174,8 +173,10 @@ namespace Debugger
 							throw new DebuggerException("Evaluation can not be stopped");
 						}
 					}
+					// Note that this sets Evaluated to true
+					state = EvalState.EvaluatedTimeOut;
 				}
-				process.WaitForPause();
+				process.AssertPaused();
 				return this.Result;
 			} catch (ProcessExitedException) {
 				throw new GetValueException("Process exited");