From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 30 Jul 2008 18:33:12 +0000 (+0000)
Subject: Merged revisions 134475 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1559
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b310d67b133c27c25526d78ae088de367a9e153;p=thirdparty%2Fasterisk.git

Merged revisions 134475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134475 | mmichelson | 2008-07-30 13:31:47 -0500 (Wed, 30 Jul 2008) | 4 lines

Fix a spot where a function could return without bringing
a channel out of autoservice.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/app.c b/main/app.c
index 0ea5cefe69..eb3fa4f024 100644
--- a/main/app.c
+++ b/main/app.c
@@ -299,8 +299,12 @@ int ast_dtmf_stream(struct ast_channel *chan, struct ast_channel *peer, const ch
 		res = ast_waitfor(chan, 100);
 
 	/* ast_waitfor will return the number of remaining ms on success */
-	if (res < 0)
+	if (res < 0) {
+		if (peer) {
+			ast_autoservice_stop(peer);
+		}
 		return res;
+	}
 
 	if (ast_opt_transmit_silence) {
 		silgen = ast_channel_start_silence_generator(chan);