diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-08 23:17:27 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-08 23:17:27 +0000 |
commit | 9e785e889a9147f135a35956fc30126129e769f6 (patch) | |
tree | d649bf6e3448d6a38e317b88b9b199f8ef97b7c3 /main/channel.c | |
parent | 6578897ace85ea9a3d82aca75b38daed32891252 (diff) |
This mod via bug 7531
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47349 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
-rw-r--r-- | main/channel.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index ed369b9ec..ace4a41e5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3882,7 +3882,11 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha bridge_playfile(c1, c0, config->warning_sound, t); } if (config->warning_freq) { - nexteventts = ast_tvadd(nexteventts, ast_samp2tv(config->warning_freq, 1000)); + + if (time_left_ms > (config->warning_freq + 5000)) { + nexteventts = ast_tvadd(nexteventts, ast_samp2tv(config->warning_freq, 1000)); + } + } else nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000)); } |