diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-09 21:18:15 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-09 21:18:15 +0000 |
| commit | deae5e9573085f1b0ff0c85b3c6bb31ee9b6df88 (patch) | |
| tree | 2f3981be1534d2b910b5a5cbe49eb52305c415ed /apps | |
| parent | 5c56d07705d9b9303d05ee3c3dedf167cc8128b3 (diff) | |
Merged revisions 162342 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r162342 | file | 2008-12-09 17:16:37 -0400 (Tue, 09 Dec 2008) | 11 lines
Merged revisions 162341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r162341 | file | 2008-12-09 17:14:29 -0400 (Tue, 09 Dec 2008) | 4 lines
Add 'down' as a valid state for directed call pickup. This creeps up when we receive session progress when dialing a device and not ringing.
(closes issue #14005)
Reported by: ddl
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@162344 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_directed_pickup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index 1ead1d772..6e467ff80 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -90,7 +90,7 @@ static int pickup_do(struct ast_channel *chan, struct ast_channel *target) /* Helper function that determines whether a channel is capable of being picked up */ static int can_pickup(struct ast_channel *chan) { - if (!chan->pbx && (chan->_state == AST_STATE_RINGING || chan->_state == AST_STATE_RING)) + if (!chan->pbx && (chan->_state == AST_STATE_RINGING || chan->_state == AST_STATE_RING || chan->_state == AST_STATE_DOWN)) return 1; else return 0; |