Fix threeway calling + immediate mode (bug #2344)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3705 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 1 deletions

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index ac0c268de..a061712ed 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -4760,7 +4760,12 @@ static void *ss_thread(void *data)
 		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");