diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-13 03:52:45 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-13 03:52:45 +0000 |
commit | 941fb1ab69f0232d22a9223dc355e7c812cbebe9 (patch) | |
tree | 256cf1c94539c2ba9644eccdef46b63b81fdf73b /app.c | |
parent | ab05545a7e63f545e6b4633a6bb986617fe82cb9 (diff) |
updating to current 1.2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8046 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'app.c')
-rw-r--r-- | app.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -316,8 +316,12 @@ int ast_dtmf_stream(struct ast_channel *chan,struct ast_channel *peer,char *digi } } } - if (peer) - res = ast_autoservice_stop(peer); + if (peer) { + /* Stop autoservice on the peer channel, but don't overwrite any error condition + that has occurred previously while acting on the primary channel */ + if (ast_autoservice_stop(peer) && !res) + res = -1; + } } return res; } |