From: Automerge script <automerge@asterisk.org>
Date: Mon, 31 Jul 2006 18:03:36 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.11-netsec~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a4688c5ba55e29e0c58ddd7182aef4298a517ff;p=thirdparty%2Fasterisk.git

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 a122abf5ff..703b7fd82e 100644
--- 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;