sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olle Johansson 2006-01-25 09:50:28 +00:00
parent 4a8afe697c
commit 1d99282f9f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channel.c
View File

@ -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");