[svn-commits] mattf: trunk r60487 - in /trunk: ./ channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Fri Apr  6 13:26:24 2007
New Revision: 60487

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60487
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=60487&r1=60486&r2=60487
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri Apr  6 13:26:24 2007
@@ -3872,7 +3872,7 @@
 		*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);