summaryrefslogtreecommitdiff
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-09-02 03:32:07 +0000
committerMark Spencer <markster@digium.com>2004-09-02 03:32:07 +0000
commit4b2877834e5438868427eee5cfe333369724743b (patch)
tree9058922c204484c389bbe00aba8312fdba610c3f /channels/chan_zap.c
parent344ec00439dc4bb2fb3737b2962a94d65421966f (diff)
Fix threeway calling + immediate mode (bug #2344)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
-rwxr-xr-xchannels/chan_zap.c7
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");