[Asterisk-cvs] asterisk/channels chan_zap.c,1.285,1.286

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv12777/channels

Modified Files:
	chan_zap.c 
Log Message:
Don't munge outgoing call progress when fax enabled (bug #1909)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- chan_zap.c	25 Jun 2004 19:33:27 -0000	1.285
+++ chan_zap.c	25 Jun 2004 21:17:08 -0000	1.286
@@ -3060,7 +3060,7 @@
 						}
 					}
 					if (ast->_state == AST_STATE_DIALING) {
-						if (p->callprogress && CANPROGRESSDETECT(p) && p->dsp && p->outgoing) {
+						if ((p->callprogress & 1) && CANPROGRESSDETECT(p) && p->dsp && p->outgoing) {
 							ast_log(LOG_DEBUG, "Done dialing, but waiting for progress detection before doing more...\n");
 						} else if (p->confirmanswer || (!p->dialednone && ((p->sig == SIG_EM) || (p->sig == SIG_EM_E1) ||  (p->sig == SIG_EMWINK) || (p->sig == SIG_FEATD) || (p->sig == SIG_FEATDMF) || (p->sig == SIG_E911) || (p->sig == SIG_FEATB) || (p->sig == SIG_SF) || (p->sig == SIG_SFWINK) || (p->sig == SIG_SF_FEATD) || (p->sig == SIG_SF_FEATDMF) || (p->sig == SIG_SF_FEATB)))) {
 							ast_setstate(ast, AST_STATE_RINGING);