[Asterisk-cvs] asterisk/channels chan_zap.c,1.344.2.23,1.344.2.24

[russell]

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

Modified Files:
      Tag: v1-0
	chan_zap.c 
Log Message:
don't allow call waiting during the initial ringing (issue #5188)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.344.2.23
retrieving revision 1.344.2.24
diff -u -d -r1.344.2.23 -r1.344.2.24
--- chan_zap.c	26 Aug 2005 16:20:51 -0000	1.344.2.23
+++ chan_zap.c	13 Sep 2005 23:22:18 -0000	1.344.2.24
@@ -6710,7 +6710,7 @@
 	}
 	
 	if ((p->owner->_state != AST_STATE_UP) &&
-		(p->owner->_state != AST_STATE_RINGING)) {
+		((p->owner->_state != AST_STATE_RINGING) || p->outgoing)) {
 		/* If the current call is not up, then don't allow the call */
 		return 0;
 	}