From 821c94197632b412c1b78fb65c129f876d8e2214 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 16 Feb 2007 17:07:10 +0000 Subject: [PATCH] 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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54885 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/app_dial.c b/apps/app_dial.c index 47fdc5b79c..178cd279ae 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -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 */