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: https://origsvn.digium.com/svn/asterisk/branches/1.4@77768 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_macro.c b/apps/app_macro.c
index aa7a3f10e95f768ca7d37e6da741c73e1e57f629..cf47df024663baaa70964dd100f55e2509e3fae2 100644 (file)
--- 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");