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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@162343 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_directed_pickup.c

@@ -79,7 +79,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;