diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2017-01-25 17:19:18 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2017-01-25 17:19:18 +0300 |
| commit | 239def51e3a1addbad9cffc818e978a8fc6d8afb (patch) | |
| tree | 1e7792ed5865a336d960865095b22c289e5e1cff /main/src/addins/MonoDevelop.Debugger.Win32 | |
| parent | 1b72513a45820d8e9f4c5aef9d3af2021bf48b42 (diff) | |
| parent | fa4b1da31510f710c4bc6c3db91e165d9d30d096 (diff) | |
Merge remote-tracking branch 'monodevelop/dotnetcore' into vNext
Conflicts:
main/external/mono-addins
main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotnetCore.Debugger/DotNetCoreDebuggerSession.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs
version-checks
Diffstat (limited to 'main/src/addins/MonoDevelop.Debugger.Win32')
| -rw-r--r-- | main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/CorDebuggerSession.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/CorDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/CorDebuggerSession.cs index a06bee9c44..e8f7ec0b68 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/CorDebuggerSession.cs +++ b/main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/CorDebuggerSession.cs @@ -155,10 +155,23 @@ namespace Mono.Debugging.Win32 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;
|