From: Russell Bryant Date: Tue, 1 May 2007 21:57:58 +0000 (+0000) Subject: Merged revisions 62548 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2776 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37d94ceab973cc109e23c246c3dde86ff55bfdc1;p=thirdparty%2Fasterisk.git Merged revisions 62548 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r62548 | russell | 2007-05-01 16:57:10 -0500 (Tue, 01 May 2007) | 12 lines Merged revisions 62547 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r62547 | russell | 2007-05-01 16:55:19 -0500 (Tue, 01 May 2007) | 4 lines Remove an unnecessary check that makes it so if you hang up after doing an attended transfer before the target extension answers the channel, the transfer is not successful. (issue #9338, patch by svanlund) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62549 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_features.c b/res/res_features.c index bbb25e21e1..80cd787e10 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -839,7 +839,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT); ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT); res = ast_bridge_call(transferer, newchan, &bconfig); - if (newchan->_softhangup || newchan->_state != AST_STATE_UP || !transferer->_softhangup) { + if (newchan->_softhangup || !transferer->_softhangup) { ast_hangup(newchan); if (ast_stream_and_wait(transferer, xfersound, "")) ast_log(LOG_WARNING, "Failed to play transfer sound!\n");