[asterisk-commits] rmudgett: branch 1.8 r304007 - in /branches/1.8: ./ main/features.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Jan 25 17:28:25 2011
New Revision: 304007

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304007
Log:
Merged revisions 304006 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r304006 | rmudgett | 2011-01-25 17:25:32 -0600 (Tue, 25 Jan 2011) | 15 lines
  
  Merged revisions 304005 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r304005 | rmudgett | 2011-01-25 17:21:09 -0600 (Tue, 25 Jan 2011) | 8 lines
    
    DTMF attended transfers sometimes fail for no apparent reason.
    
    The loop in feature_request_and_dial() can exit when Party C has answered
    without processing an AST_CONTROL_ANSWER.  Also sometimes an
    AST_CONTROL_ANSWER never happens even though Party C has answered.
    
    Don't hangup Party C if he is up or we receive an AST_CONTROL_ANSWER.
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/features.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/features.c?view=diff&rev=304007&r1=304006&r2=304007
==============================================================================
--- branches/1.8/main/features.c (original)
+++ branches/1.8/main/features.c Tue Jan 25 17:28:25 2011
@@ -3245,9 +3245,8 @@
 
 done:
 	ast_indicate(caller, -1);
-	if (chan && ready) {
-		if (chan->_state == AST_STATE_UP)
-			state = AST_CONTROL_ANSWER;
+	if (chan && (ready || chan->_state == AST_STATE_UP)) {
+		state = AST_CONTROL_ANSWER;
 	} else if (chan) {
 		ast_hangup(chan);
 		chan = NULL;