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 41d2d30c232290f46cfbe9693a83e844e63d22c6..7211e5daa85ca8127e964ddf2f281908f383d302 100644 (file)
--- 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);