Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv29682/channels
Modified Files:
chan_zap.c
Log Message:
un-break three-way calling
Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -d -r1.465 -r1.466
--- chan_zap.c 24 Jun 2005 02:37:32 -0000 1.465
+++ chan_zap.c 24 Jun 2005 19:15:51 -0000 1.466
@@ -3817,7 +3817,7 @@
} else {
/* Lets see what we're
up to */
if (((ast->pbx) ||
(ast->_state == AST_STATE_UP)) &&
- (!p->transfertobusy
&& (p->owner->_state != AST_STATE_BUSY))) {
+ (p->transfertobusy
|| (p->owner->_state != AST_STATE_BUSY))) {
int otherindex
= SUB_THREEWAY;
if
(option_verbose > 2)
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
