From 59984d6414c328cd5f067eaed0b9d50e3ede52fa Mon Sep 17 00:00:00 2001
From: Rejean Loyer <rejean.loyer@gmail.com>
Date: Wed, 22 May 2013 23:12:53 -0400
Subject: [PATCH] ide, debugger; fixed breakpoints issues when using run to
 cursor together with breakpoints. closes #748.

---
 ide/src/debugger/Debugger.ec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ide/src/debugger/Debugger.ec b/ide/src/debugger/Debugger.ec
index dfb1124..0e9e984 100644
--- a/ide/src/debugger/Debugger.ec
+++ b/ide/src/debugger/Debugger.ec
@@ -2708,13 +2708,6 @@ class Debugger
                      GoToStackFrameLine(activeFrameLevel, true);
                      ideMainFrame.Activate();   // TOFIX: ide.Activate() is not reliable (app inactive)
                      ide.Update(null);
-                     if(bp.type == BreakpointType::runToCursor)
-                     {
-                        if(symbols)
-                           GdbCommand(false, "-break-delete %d", bp.bp.number);
-                        delete bpRunToCursor;
-                        bpRunToCursor = null;
-                     }
                   }
                   else
                   {
@@ -2730,6 +2723,13 @@ class Debugger
       }
       else
          ide.outputView.debugBox.Logf("Debugger Error: Breakpoint hit could not match breakpoint instance\n");
+
+      if(bpRunToCursor)
+      {
+         if(symbols && bpRunToCursor.inserted)
+            GdbCommand(false, "-break-delete %d", bpRunToCursor.bp.number);
+         delete bpRunToCursor;
+      }
    }
 
    void GdbThreadExit()
-- 
1.8.3.1