diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java index e32d2f1b76c..528d4eb171a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java @@ -523,6 +523,13 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana bkptMap.put( breakpoint, cdiEventBkpt ); } } + + // Delete the new CDT breakpoint if we didn't end up using it + if (newBreakpoint != null && newBreakpoint != breakpoint) { + try { + newBreakpoint.delete(); + } catch (CoreException e) {} + } if ( breakpoint != null ) { try { @@ -572,6 +579,13 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana bkptMap.put( breakpoint, cdiBreakpoint ); } } + + // Delete the new CDT breakpoint if we didn't end up using it + if (newBreakpoint != null && newBreakpoint != breakpoint) { + try { + newBreakpoint.delete(); + } catch (CoreException e) {} + } if ( breakpoint != null ) { try { @@ -624,6 +638,14 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana bkptMap.put( breakpoint, cdiWatchpoint ); } } + + // Delete the new CDT breakpoint if we didn't end up using it + if (newBreakpoint != null && newBreakpoint != breakpoint) { + try { + newBreakpoint.delete(); + } catch (CoreException e) {} + } + if ( breakpoint != null ) { try {