From: Matt O'Gorman <mogorman@digium.com>
Date: Thu, 12 Jan 2006 19:15:20 +0000 (+0000)
Subject: Oops... need to keep my trunk folder clean...
X-Git-Tag: 1.4.0-beta1~2964
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6638d52625ebb1b9ccca63c24cf3f88c8c9756d;p=thirdparty%2Fasterisk.git

Oops... need to keep my trunk folder clean...


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d57c35b8c9..e69a8a50c0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2680,9 +2680,8 @@ static int sip_indicate(struct ast_channel *ast, int condition)
 	switch(condition) {
 	case AST_CONTROL_RINGING:
 		if (ast->_state == AST_STATE_RING) {
-			if ((!ast_test_flag(p, SIP_PROGRESS_SENT) ||
-			    (ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) &&
-			    ast_test_flag(p, SIP_PROG_INBAND) != SIP_PROG_INBAND_YES) {				
+			if (!ast_test_flag(p, SIP_PROGRESS_SENT) ||
+			    (ast_test_flag(p, SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER)) {				
 				/* Send 180 ringing if out-of-band seems reasonable */
 				transmit_response(p, "180 Ringing", &p->initreq);
 				ast_set_flag(p, SIP_RINGING);