[asterisk-commits] jpeeler: trunk r210302 - /trunk/main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Aug  4 10:35:49 2009
New Revision: 210302

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=210302
Log:
Fix broken call pickup

The find_channel_by_group callback was only looking at the channel that was
attempting to make the pickup instead of the other channels in the container.

Modified:
    trunk/main/features.c

Modified: trunk/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/features.c?view=diff&rev=210302&r1=210301&r2=210302
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Tue Aug  4 10:35:49 2009
@@ -4630,13 +4630,13 @@
 	struct ast_channel *c = data;
 	struct ast_channel *chan = obj;
 
-	int i = !c->pbx &&
+	int i = !chan->pbx &&
 		/* Accessing 'chan' here is safe without locking, because there is no way for
 		   the channel do disappear from under us at this point.  pickupgroup *could*
 		   change while we're here, but that isn't a problem. */
 		(c != chan) &&
 		(chan->pickupgroup & c->callgroup) &&
-		((c->_state == AST_STATE_RINGING) || (c->_state == AST_STATE_RING));
+		((chan->_state == AST_STATE_RINGING) || (chan->_state == AST_STATE_RING));
 
 	return i ? CMP_MATCH | CMP_STOP : 0;
 }