aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-06 18:26:24 +0000
committermattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-06 18:26:24 +0000
commitf65e7bfa4a3b6030a3e47499dc767a09fb301a9a (patch)
tree681b0e10c90db41701a85f4c55424a13bb753328
parent572e7d9e593a62064d1baf7e2b094f1915b5a8f8 (diff)
Merged revisions 60485 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60485 | mattf | 2007-04-06 13:21:52 -0500 (Fri, 06 Apr 2007) | 2 lines Make sure we check the faxdetect option before doing fax processing ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@60487 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_zap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 95342f0d5..6479311e7 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3872,7 +3872,7 @@ static void zt_handle_dtmfup(struct ast_channel *ast, int index, struct ast_fram
*dest = &p->subs[index].f;
} else if (f->subclass == 'f') {
/* Fax tone -- Handle and return NULL */
- if (!p->faxhandled) {
+ if ((p->callprogress & 0x6) && !p->faxhandled) {
p->faxhandled++;
if (strcmp(ast->exten, "fax")) {
const char *target_context = S_OR(ast->macrocontext, ast->context);