diff options
| author | Steve Murphy <murf@digium.com> | 2006-11-08 23:17:27 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2006-11-08 23:17:27 +0000 |
| commit | 2e375b388ebc5a212c9c0f8a6ff2f5ebf8062723 (patch) | |
| tree | d649bf6e3448d6a38e317b88b9b199f8ef97b7c3 /main/channel.c | |
| parent | 29074335998012282e55857156ba8f1e05fbf574 (diff) | |
This mod via bug 7531
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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)); } |