aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-06 13:16:34 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-06 13:16:34 +0000
commit9ec06834aa8b170447f70241de3d7f6d7cef8f46 (patch)
tree681b14db8d85e5a410a88a3b1b641fbd5d7923b6 /apps
parent5fbbfece03a1e3247545f46d8cd9caf8dae864d9 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@67626 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_directed_pickup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index 9aba195ec..1d5318f56 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, char *exten, char *context)
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);