[svn-commits] file: trunk r67628 - in /trunk: ./ apps/app_directed_pickup.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Jun  6 08:17:26 2007
New Revision: 67628

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67628
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_directed_pickup.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_directed_pickup.c?view=diff&rev=67628&r1=67627&r2=67628
==============================================================================
--- trunk/apps/app_directed_pickup.c (original)
+++ trunk/apps/app_directed_pickup.c Wed Jun  6 08:17:26 2007
@@ -96,7 +96,7 @@
 	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);