diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 18:33:58 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 18:33:58 +0000 |
| commit | c87005e959c109d65ea26f767059d6cdef46b7be (patch) | |
| tree | de2ea74c792f3f6348dc58b7df60656675e2f478 /main/app.c | |
| parent | ba51f55f58f91629f6f67d4de7a49dafe949fd1f (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@134477 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/app.c b/main/app.c index c0c9c0309..2b63128af 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); |