diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-25 10:01:13 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-25 10:01:13 +0000 |
commit | 5b4afe3c292f7770f1e5453407eca1fd2624fcb0 (patch) | |
tree | 312206adce415158c71f0b2bf72fd8e1f1c9272e /channel.c | |
parent | 066de0935dc54a4804867ad692f07f60173eb260 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8641 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -3235,11 +3235,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"); |