From 656005417bed2f7487a70c66e8fe643060a95066 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 30 Jul 2008 18:33:58 +0000
Subject: [PATCH] Merged revisions 134476 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
r134476 | mmichelson | 2008-07-30 13:33:12 -0500 (Wed, 30 Jul 2008) | 12 lines

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/branches/1.6.0@134477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/app.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main/app.c b/main/app.c
index c0c9c0309f..2b63128aff 100644
--- a/main/app.c
+++ b/main/app.c
@@ -256,8 +256,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);