diff options
author | Olle Johansson <oej@edvina.net> | 2006-01-25 09:50:28 +0000 |
---|---|---|
committer | Olle Johansson <oej@edvina.net> | 2006-01-25 09:50:28 +0000 |
commit | 1d99282f9f579900b5991608f6aa3bd3b98b0d83 (patch) | |
tree | 81a3796b6a6b4b2cea5e7891f7ae9480f78d8289 /channel.c | |
parent | 4a8afe697c9a9ae4e38469ce35fd5a6b629de124 (diff) |
Issue #6349 - patch by markster, imported from 1.2
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -3298,11 +3298,14 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct res = AST_BRIDGE_RETRY; break; } - to = ast_tvdiff_ms(bridge_end, ast_tvnow()); - if (to <= 0) { - res = AST_BRIDGE_RETRY; - break; - } + if (bridge_end.tv_sec) { + to = ast_tvdiff_ms(bridge_end, ast_tvnow()); + if (to <= 0) { + res = AST_BRIDGE_RETRY; + break; + } + } else + to = -1; who = ast_waitfor_n(cs, 2, &to); if (!who) { ast_log(LOG_DEBUG, "Nobody there, continuing...\n"); |