diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-16 18:53:17 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-16 18:53:17 +0000 |
| commit | b70a6ff726ef0b2b858036fb56b67bfc2e20ea07 (patch) | |
| tree | 2fbb7772072c0a669a865e38cd0b88ff9b2f005f /apps/app_dial.c | |
| parent | 91a0c3bd917e2d716b6217224bc78a2b3f1510c1 (diff) | |
Merged revisions 54924 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r54924 | file | 2007-02-16 13:51:15 -0500 (Fri, 16 Feb 2007) | 2 lines
Need to check macro extension as well as macro context for directed pickup.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@54925 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 178cd279a..524837f12 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1397,7 +1397,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags 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)); + if (!ast_strlen_zero(chan->macroexten)) + ast_copy_string(tc->exten, chan->macroexten, sizeof(tc->exten)); + else + 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 */ |