Need to check macro extension as well as macro context for directed pickup.

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 323647834e0e28e9845b2d36adb33cce8a571b9d..a585cfaa96788762551184d403637a44a630c6de 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1189,7 +1189,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        ast_copy_string(tmp->chan->dialcontext, chan->macrocontext, sizeof(tmp->chan->dialcontext));
                else
                        ast_copy_string(tmp->chan->dialcontext, chan->context, sizeof(tmp->chan->dialcontext));
-               ast_copy_string(tmp->chan->exten, chan->exten, sizeof(tmp->chan->exten));
+               if (!ast_strlen_zero(chan->macroexten))
+                       ast_copy_string(tmp->chan->exten, chan->macroexten, sizeof(tmp->chan->exten));
+               else
+                       ast_copy_string(tmp->chan->exten, chan->exten, sizeof(tmp->chan->exten));
 
                /* Place the call, but don't wait on the answer */
                res = ast_call(tmp->chan, numsubst, 0);