diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-30 14:51:44 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-30 14:51:44 +0000 |
commit | 20aadb7c834757c7992f073cab02ebed1e3acd84 (patch) | |
tree | c0957b34d7ff8fb140fa522cc0edeea65445b6dd | |
parent | db332bb88e8ba750aa4dd010c24aa71060483a7e (diff) |
Merged revisions 77767 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r77767 | file | 2007-07-30 11:50:02 -0300 (Mon, 30 Jul 2007) | 4 lines
(closes issue #10334)
Reported by: ramonpeek
Pass through the return value from macro_exec through the MacroIf application.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@77768 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_macro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index aa7a3f10e..cf47df024 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -512,9 +512,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"); |