From 94bef1a25663a1ca6df3a5038ddae154f919dc9e Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 30 Jul 2007 14:53:14 +0000 Subject: Merged revisions 77768 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r77768 | file | 2007-07-30 11:51:44 -0300 (Mon, 30 Jul 2007) | 12 lines 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/trunk@77769 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_macro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/app_macro.c b/apps/app_macro.c index 923bd583f..0b9f87e83 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -493,9 +493,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"); -- cgit v1.2.3