diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-15 21:33:41 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-15 21:33:41 +0000 |
| commit | 35d00fad1d925926576bb1336416fb070955e208 (patch) | |
| tree | a6b5f754befdd41551db332be8b58346dfcf2244 /main | |
| parent | 3134607c2ebbdd1d2eb522c33e182005113b9b89 (diff) | |
We need to ensure timelimit stuff is included as well so warnings get played. (issue #8050 reported by KNK)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47707 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index 8db899747..95293d661 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3648,7 +3648,10 @@ 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_COMPLETE; + if (config->timelimit) + res = AST_BRIDGE_RETRY; + else + res = AST_BRIDGE_COMPLETE; break; } } else @@ -3828,8 +3831,11 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha now = ast_tvnow(); to = ast_tvdiff_ms(nexteventts, now); if (to <= 0) { - res = AST_BRIDGE_COMPLETE; - break; + if (!config->timelimit) { + res = AST_BRIDGE_COMPLETE; + break; + } + to = 0; } } |