Author: file Date: Mon Jul 30 09:53:14 2007 New Revision: 77769 URL: http://svn.digium.com/view/asterisk?view=rev&rev=77769 Log: 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. ........ ................ Modified: trunk/ (props changed) trunk/apps/app_macro.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-1.4-merged' - no diff available. Modified: trunk/apps/app_macro.c URL: http://svn.digium.com/view/asterisk/trunk/apps/app_macro.c?view=diff&rev=77769&r1=77768&r2=77769 ============================================================================== --- trunk/apps/app_macro.c (original) +++ trunk/apps/app_macro.c Mon Jul 30 09:53:14 2007 @@ -493,9 +493,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
