Don't activate address breakpoints twice.

2009-11-25 Martin Baulig <martin@ximian.com> Don't activate address breakpoints twice. * classes/AddressBreakpoint.cs (AddressBreakpoint.NeedsActivation): Overwrite and return `false'. * frontend/Command.cs (BreakCommand.DoExecute): Check `Breakpoint.NeedsActivation' before calling Activate() on it. svn path=/trunk/debugger/; revision=147673
mono · Dec 4, 2009 · b631f2f · b631f2f
1 parent 16a09fb
commit b631f2f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-25  Martin Baulig  <martin@ximian.com>
+
+	Don't activate address breakpoints twice.
+
+	* classes/AddressBreakpoint.cs
+	(AddressBreakpoint.NeedsActivation): Overwrite and return `false'.
+
+	* frontend/Command.cs
+	(BreakCommand.DoExecute): Check `Breakpoint.NeedsActivation' before
+	calling Activate() on it.
+
 2009-10-19  Martin Baulig  <martin@ximian.com>
 
 	* backend/Inferior.cs

diff --git a/classes/AddressBreakpoint.cs b/classes/AddressBreakpoint.cs
@@ -14,6 +14,10 @@ public override bool IsPersistent {
 			get { return false; }
 		}
 
+		public override bool NeedsActivation {
+			get { return false; }
+		}
+
 		public TargetAddress Address {
 			get { return address; }
 		}

diff --git a/frontend/Command.cs b/frontend/Command.cs
@@ -3291,7 +3291,8 @@ protected override object DoExecute (ScriptingContext context)
 				return handle.Index;
 
 			try {
-				handle.Activate (context.Interpreter.CurrentThread);
+				if (handle.NeedsActivation)
+					handle.Activate (context.Interpreter.CurrentThread);
 			} catch {
 				if (!lazy)
 					throw;