diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-04 15:35:49 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-04 15:35:49 +0000 |
commit | 090abe2554036146223834562fee73e47949ec60 (patch) | |
tree | 6bfba579442790740c80552f51742b29317e4f98 /main | |
parent | 7a4ba0f5794842d5f4ac7999a7e888baeaf04188 (diff) |
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.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@210302 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 457e6c948..b0774c2b7 100644 --- a/main/features.c +++ b/main/features.c @@ -4630,13 +4630,13 @@ static int find_channel_by_group(void *obj, void *arg, void *data, int flags) 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; } |