diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-06-06 13:17:26 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-06-06 13:17:26 +0000 |
| commit | 4ba8071bdaa59be271bd8074cdcaaf75009b982e (patch) | |
| tree | a09c9c57e9904c0ed6e415c6777c5de802685bfc /apps/app_directed_pickup.c | |
| parent | 3f463b76687fe73a637ec5260078fcbc5096cacc (diff) | |
Merged revisions 67626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r67626 | file | 2007-06-06 09:16:34 -0400 (Wed, 06 Jun 2007) | 2 lines
Include macroexten while searching for a channel to pick up in case they are in a macro. (issue #9491 reported by jamesb63)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_directed_pickup.c')
| -rw-r--r-- | apps/app_directed_pickup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index 60741fcb6..f377205ef 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -96,7 +96,7 @@ static int pickup_by_exten(struct ast_channel *chan, const char *exten, const ch struct ast_channel *target = NULL; while ((target = ast_channel_walk_locked(target))) { - if (!strcasecmp(target->exten, exten) && + if ((!strcasecmp(target->macroexten, exten) || !strcasecmp(target->exten, exten)) && !strcasecmp(target->dialcontext, context) && can_pickup(target)) { res = pickup_do(chan, target); |