aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_macro.c
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-02 16:03:57 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-02 16:03:57 +0000
commit3a63233871d6846d683a0c8006d0f6931a6dcb68 (patch)
treedafbff34471569e0f12a326b8a7c59100efc9cfb /apps/app_macro.c
parentc449988a15ffb11546567a786dea8e9e77a35bce (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@77937 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
-rw-r--r--apps/app_macro.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 4002a8b00..557155c71 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -482,9 +482,9 @@ static int macroif_exec(struct ast_channel *chan, void *data)
label_b++;
}
if (pbx_checkcondition(expr))
- macro_exec(chan, label_a);
+ res = macro_exec(chan, label_a);
else if (label_b)
- macro_exec(chan, label_b);
+ res = macro_exec(chan, label_b);
} else
ast_log(LOG_WARNING, "Invalid Syntax.\n");