diff options
author | Mark Spencer <markster@digium.com> | 2005-08-08 06:54:36 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2005-08-08 06:54:36 +0000 |
commit | d9cb23cc90bced1c61eac86071b810f6a608a174 (patch) | |
tree | 477b535ccc4175725550d3edc9e1ecd4ffb3bb12 /channel.c | |
parent | ce49016c96a526c35b8a5cd6aa70b23a42cb88dd (diff) |
Don't wait longer than our timeout for something to happen (bug #4653)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rwxr-xr-x | channel.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -2879,7 +2879,7 @@ static int ast_generic_bridge(int *playitagain, int *playit, struct ast_channel /* Copy voice back and forth between the two channels. Give the peer the ability to transfer calls with '#<extension' syntax. */ struct ast_channel *cs[3]; - int to = -1; + int to; struct ast_frame *f; struct ast_channel *who = NULL; void *pvt0, *pvt1; @@ -2922,8 +2922,10 @@ static int ast_generic_bridge(int *playitagain, int *playit, struct ast_channel res = -3; break; } - - } + to = time_left_ms; + } else + to = -1; + who = ast_waitfor_n(cs, 2, &to); if (!who) { |