[asterisk-commits] mnicholson: trunk r218224 - in /trunk: ./ apps/app_directed_pickup.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Sep 14 09:57:23 2009
New Revision: 218224

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218224
Log:
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:
    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.asterisk.org/svn-view/asterisk/trunk/apps/app_directed_pickup.c?view=diff&rev=218224&r1=218223&r2=218224
==============================================================================
--- trunk/apps/app_directed_pickup.c (original)
+++ trunk/apps/app_directed_pickup.c Mon Sep 14 09:57:23 2009
@@ -216,7 +216,7 @@
 
 	while ((target = ast_channel_iterator_next(iter))) {
 		ast_channel_lock(target);
-		if (can_pickup(target)) {
+		if ((chan != target) && can_pickup(target)) {
 			break;
 		}
 		ast_channel_unlock(target);