Merged revisions 54884 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Fri, 16 Feb 2007 17:07:10 +0000 (17:07 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 16 Feb 2007 17:07:10 +0000 (17:07 +0000)
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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54885 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dial.c

index 47fdc5b..178cd27 100644 (file)
@@ -1393,7 +1393,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        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 */