From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 25 Jan 2011 23:25:32 +0000 (+0000)
Subject: Merged revisions 304005 via svnmerge from
X-Git-Tag: 1.6.2.18-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=418ce988275660db6fc2ecb66cf7ba23c4130e87;p=thirdparty%2Fasterisk.git

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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@304006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 6e90b5ee76..8710f248cc 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2663,9 +2663,8 @@ static struct ast_channel *feature_request_and_dial(struct ast_channel *caller,
 
 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;