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
This commit is contained in:
Mark Michelson
2008-07-30 18:33:12 +00:00
parent 01e189f6d8
commit 8b310d67b1

View File

@@ -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);