From: Automerge Script Date: Tue, 1 May 2007 22:18:10 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.19-netsec~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da66cc3c63e278765c6e0acee3dc3c8c156f0dad;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@62592 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_features.c b/res/res_features.c index 41d2d30c23..7211e5daa8 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -734,7 +734,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 (f) { ast_frfree(f);