automerge commit

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

diff --git a/res/res_features.c b/res/res_features.c
index a122abf5ffffe1d6aa349cee9812172015219636..703b7fd82e0bfb5d46ebef049223cab7f0cfc4db 100644 (file)
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -842,6 +842,9 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
                }
        }  else {
                ast_log(LOG_WARNING, "Did not read data.\n");
+               ast_moh_stop(transferee);
+               ast_autoservice_stop(transferee);
+               ast_indicate(transferee, AST_CONTROL_UNHOLD);
                res = ast_streamfile(transferer, "beeperr", transferer->language);
                if (ast_waitstream(transferer, "") < 0) {
                        return -1;