Merge pull request #1789 from JetBrains/breakpointDeactivationFix

[CorDebug] Proper deactivation of breakpoints

Author: David Karlaš

Mono.Debugging.Win32/CorDebuggerSession.cs

@@ -155,10 +155,23 @@ void QueueToHelperThread (Action action)
 			helperOperationsQueue.Add (action);
 		}
 
+		void DeactivateBreakpoints ()
+		{
+			var breakpointsCopy = breakpoints.Keys.ToList ();
+			foreach (var corBreakpoint in breakpointsCopy) {
+				try {
+					corBreakpoint.Activate (false);
+				}
+				catch (Exception e) {
+					DebuggerLoggingService.LogMessage ("Exception in DeactivateBreakpoints(): {0}", e);
+				}
+			}
+		}
+
 		void TerminateDebugger ()
 		{
 			helperOperationsCancellationTokenSource.Cancel();
-			Breakpoints.Clear ();
+			DeactivateBreakpoints ();
 			lock (terminateLock) {
 				if (terminated)
 					return;