[xdebug-dev] xdebug xdebug/xdebug.c - Fixed bug #284: Step_over on breakpointed line made Xdebug break twice.

Date: Thu Jul 5 21:08:37 CEST 2007
User: Derick Rethans
Directory: xdebug

Log Message:
[2.50]
- Fixed bug #284: Step_over on breakpointed line made Xdebug break twice.

Modified files:
           xdebug/xdebug.c (version: 1.396)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- xdebug/xdebug.c:1.395 Sun Jun 24 18:20:17 2007 GMT
+++ xdebug/xdebug.c Thu Jul 05 17:08:37 2007 GMT
@@ -2986,20 +2986,27 @@
                                 XG(remote_enabled) = 0;
                                 return;
                         }
- } else if (XG(context).do_next && XG(context).next_level >= level) { /* Check for "next" */
+ return;
+ }
+
+ if (XG(context).do_next && XG(context).next_level >= level) { /* Check for "next" */
                         XG(context).do_next = 0;
 
                         if (!XG(context).handler->remote_breakpoint(&(XG(context)), XG(stack), file, lineno, XDEBUG_STEP, NULL, NULL)) {
                                 XG(remote_enabled) = 0;
                                 return;
                         }
- } else if (XG(context).do_step) { /* Check for "step" */
+ return;
+ }
+
+ if (XG(context).do_step) { /* Check for "step" */
                         XG(context).do_step = 0;
 
                         if (!XG(context).handler->remote_breakpoint(&(XG(context)), XG(stack), file, lineno, XDEBUG_STEP, NULL, NULL)) {
                                 XG(remote_enabled) = 0;
                                 return;
                         }
+ return;
                 }
 
                 if (XG(context).line_breakpoints) {
@@ -3047,7 +3054,7 @@
                                                         XG(remote_enabled) = 0;
                                                         break;
                                                 }
- break;
+ return;
                                         }
                                 }
                         }
Received on Thu Jul 05 2007 - 21:08:43 BST