Merged revisions 67626 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 6 Jun 2007 13:17:26 +0000 (13:17 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 6 Jun 2007 13:17:26 +0000 (13:17 +0000)
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

apps/app_directed_pickup.c

index 60741fc..f377205 100644 (file)
@@ -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);