[asterisk-commits] mnicholson: branch 1.6.1 r218227 - in /branches/1.6.1: ./ apps/

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Sep 14 10:17:50 2009
New Revision: 218227

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218227
Log:
Merged revisions 218224 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218224 | mnicholson | 2009-09-14 09:57:23 -0500 (Mon, 14 Sep 2009) | 14 lines
  
  Merged revisions 218223 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218223 | mnicholson | 2009-09-14 09:53:57 -0500 (Mon, 14 Sep 2009) | 8 lines
    
    Ensure we don't pickup ourselves when doing pickup by exten.
    
    (closes issue #15100)
    Reported by: lmsteffan
    Patches:
          (modified) pickup.patch uploaded by lmsteffan (license 779)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_directed_pickup.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_directed_pickup.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_directed_pickup.c?view=diff&rev=218227&r1=218226&r2=218227
==============================================================================
--- branches/1.6.1/apps/app_directed_pickup.c (original)
+++ branches/1.6.1/apps/app_directed_pickup.c Mon Sep 14 10:17:50 2009
@@ -146,7 +146,7 @@
 	while ((target = ast_channel_walk_locked(target))) {
 		if ((!strcasecmp(target->macroexten, exten) || !strcasecmp(target->exten, exten)) &&
 			!strcasecmp(target->dialcontext, context) &&
-			can_pickup(target)) {
+			(chan != target) && can_pickup(target)) {
 			res = pickup_do(chan, target);
 			ast_channel_unlock(target);
 			break;