[svn-commits] file: trunk r54885 - in /trunk: ./ apps/app_dial.c

[svn-commits at lists.digium.com]

Author: file
Date: Fri Feb 16 11:07:10 2007
New Revision: 54885

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54885
Log:
Merged revisions 54884 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54884 | file | 2007-02-16 12:02:35 -0500 (Fri, 16 Feb 2007) | 2 lines

Allow directed pickup to pick up the real context instead of the macro context if a Macro is used. (issue #8984 reported by jamesb63)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=54885&r1=54884&r2=54885
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Fri Feb 16 11:07:10 2007
@@ -1393,7 +1393,10 @@
 			ast_app_group_set_channel(tc, outbound_group);
 
 		/* Inherit context and extension */
-		ast_copy_string(tc->dialcontext, chan->context, sizeof(tc->dialcontext));
+		if (!ast_strlen_zero(chan->macrocontext))
+			ast_copy_string(tc->dialcontext, chan->macrocontext, sizeof(tc->dialcontext));
+		else
+			ast_copy_string(tc->dialcontext, chan->context, sizeof(tc->dialcontext));
 		ast_copy_string(tc->exten, chan->exten, sizeof(tc->exten));
 
 		res = ast_call(tc, numsubst, 0);	/* Place the call, but don't wait on the answer */