From: Mark Spencer <markster@digium.com>
Date: Fri, 25 Jun 2004 21:17:08 +0000 (+0000)
Subject: Don't munge outgoing call progress when fax enabled (bug #1909)
X-Git-Tag: 1.0.0-rc1~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb8ad79c2119ee6322478214231df7f86eecfd0;p=thirdparty%2Fasterisk.git

Don't munge outgoing call progress when fax enabled (bug #1909)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3308 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 2c48f67ea5..26c0c95c79 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3060,7 +3060,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
 						}
 					}
 					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);