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: https://origsvn.digium.com/svn/asterisk/trunk@60487 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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