fixup help, behaviour of step command when not executing

2 files changed, 10 insertions, 6 deletions

diff --git a/phpdbg_help.c b/phpdbg_help.c
index 32a78cb063..f2d074ded6 100644
--- a/phpdbg_help.c
+++ b/phpdbg_help.c
@@ -711,11 +711,13 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 "populate these tables for a given execution context."
 },
 
-//*********** what is the difference between n and s ???
 {"continue",
-"The **continue** command causes control to be passed back to the vm, continuing execution.  The next "
-"opline will be executed if **step** is set **on**.  Otherwise execution will continue to the next "
-"breakpoint or script completion" CR CR
+"Continue with execution after hitting a break or watchpoint" CR CR
+
+"**Examples**" CR CR
+"    $P continue" CR
+"    $P c" CR
+"    Continue executing until the next break or watchpoint" CR CR
 
 "Note **continue** will trigger a \"not running\" error if not executing."
 },
@@ -863,7 +865,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 },
 
 {"step",
-"Execute opcodes until beginning on next line" CR CR
+"Execute opcodes until next line" CR CR
 
 "**Examples**" CR CR
 
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 2e07c32174..e2603a00ed 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -424,7 +424,9 @@ int phpdbg_compile(TSRMLS_D) /* {{{ */
 
 PHPDBG_COMMAND(step) /* {{{ */
 {
-	PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
+	if (EG(in_execution)) {
+		PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
+	}
 
 	return PHPDBG_NEXT;
 } /* }}} */