aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-03-04 09:09:07 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-03-04 09:09:07 +0000
commit70397e4a957eefc2808c600214d8f7689caead71 (patch)
treee22be696ff8bc0120aa6fc71c9e1a3c8876469f7
parent43d904dbf396f5ce90e29915b416fd26e32c6c3e (diff)
downloadrtmux-70397e4a957eefc2808c600214d8f7689caead71.tar.gz
rtmux-70397e4a957eefc2808c600214d8f7689caead71.tar.bz2
rtmux-70397e4a957eefc2808c600214d8f7689caead71.zip
Print %%error not %%end guard on error, from George Nachman.
-rw-r--r--cmd-queue.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd-queue.c b/cmd-queue.c
index 054c5329..e5c84131 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -207,8 +207,12 @@ cmdq_continue(struct cmd_q *cmdq)
if (guards)
cmdq_print(cmdq, "%%begin");
retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
- if (guards)
- cmdq_print(cmdq, "%%end");
+ if (guards) {
+ if (retval == CMD_RETURN_ERROR)
+ cmdq_print(cmdq, "%%error");
+ else
+ cmdq_print(cmdq, "%%end");
+ }
if (retval == CMD_RETURN_ERROR)
break;