Author: file
Date: Mon Jul 30 09:51:44 2007
New Revision: 77768
URL: http://svn.digium.com/view/asterisk?view=rev&rev=77768
Log:
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.
........
Modified:
branches/1.4/ (props changed)
branches/1.4/apps/app_macro.c
Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Modified: branches/1.4/apps/app_macro.c
URL:
http://svn.digium.com/view/asterisk/branches/1.4/apps/app_macro.c?view=diff&rev=77768&r1=77767&r2=77768
==============================================================================
--- branches/1.4/apps/app_macro.c (original)
+++ branches/1.4/apps/app_macro.c Mon Jul 30 09:51:44 2007
@@ -512,9 +512,9 @@
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");
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
