From cb11263607eb5afc2ee1e5ec2bc2adf8d9e7e47c Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 15 Nov 2006 21:33:41 +0000 Subject: [PATCH] We need to ensure timelimit stuff is included as well so warnings get played. (issue #8050 reported by KNK) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47707 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/main/channel.c b/main/channel.c index 8db899747f..95293d6614 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; } }