Fixed infinite loop when quitting (sometimes)

This commit is contained in:
Bob Weinand 2014-04-21 23:14:06 +02:00
parent c1e12316f1
commit 447ec05f31

View file

@ -920,7 +920,7 @@ PHPDBG_COMMAND(quit) /* {{{ */
zend_bailout(); zend_bailout();
} }
return SUCCESS; return PHPDBG_NEXT;
} /* }}} */ } /* }}} */
PHPDBG_COMMAND(clean) /* {{{ */ PHPDBG_COMMAND(clean) /* {{{ */
@ -1048,7 +1048,7 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */
case PHPDBG_FINISH: case PHPDBG_FINISH:
case PHPDBG_UNTIL: case PHPDBG_UNTIL:
case PHPDBG_NEXT: { case PHPDBG_NEXT: {
if (!EG(in_execution)) { if (!EG(in_execution) && !(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
phpdbg_error("Not running"); phpdbg_error("Not running");
} }
goto out; goto out;