aboutsummaryrefslogtreecommitdiffstats
path: root/main/app.c
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-30 18:33:12 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-30 18:33:12 +0000
commit2d62a6015fb3f6baf20402c29246e3f12acf0029 (patch)
treec331f83784ed249ffa25f7307d44c3f1b376d79a /main/app.c
parentebffaaf90ee933f061892bda106aa2aa2a43b558 (diff)
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: http://svn.digium.com/svn/asterisk/trunk@134476 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/app.c')
-rw-r--r--main/app.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/app.c b/main/app.c
index 0ea5cefe6..eb3fa4f02 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);