diff options
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index 17321ee9a..fbfdd199d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3607,7 +3607,7 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct if (bridge_end.tv_sec) { to = ast_tvdiff_ms(bridge_end, ast_tvnow()); if (to <= 0) { - res = AST_BRIDGE_RETRY; + res = AST_BRIDGE_COMPLETE; break; } } else @@ -3786,8 +3786,10 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha if (!ast_tvzero(nexteventts)) { now = ast_tvnow(); to = ast_tvdiff_ms(nexteventts, now); - if (to < 0) - to = 0; + if (to <= 0) { + res = AST_BRIDGE_COMPLETE; + break; + } } if (config->timelimit) { |