[svn-commits] file: branch 1.6.0 r162343 - in /branches/1.6.0: ./ apps/app_directed_pickup.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Dec  9 15:17:25 2008
New Revision: 162343

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162343
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_directed_pickup.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_directed_pickup.c?view=diff&rev=162343&r1=162342&r2=162343
==============================================================================
--- branches/1.6.0/apps/app_directed_pickup.c (original)
+++ branches/1.6.0/apps/app_directed_pickup.c Tue Dec  9 15:17:25 2008
@@ -79,7 +79,7 @@
 /* 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;