[Asterisk-cvs] asterisk/channels chan_zap.c,1.329,1.330

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Fix threeway calling + immediate mode (bug #2344)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -d -r1.329 -r1.330
--- chan_zap.c	1 Sep 2004 02:28:38 -0000	1.329
+++ chan_zap.c	2 Sep 2004 03:32:07 -0000	1.330
@@ -4760,7 +4760,12 @@
 		if (p->subs[SUB_THREEWAY].owner) 
 			timeout = 999999;
 		while(len < AST_MAX_EXTENSION-1) {
-			res = ast_waitfordigit(chan, timeout);
+			/* Read digit unless it's supposed to be immediate, in which case the
+			   only answer is 's' */
+			if (p->immediate) 
+				res = 's';
+			else
+				res = ast_waitfordigit(chan, timeout);
 			timeout = 0;
 			if (res < 0) {
 				ast_log(LOG_DEBUG, "waitfordigit returned < 0...\n");