From 729ce4d7914428439728e3597aa5dead7a9802d5 Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Wed, 8 Nov 2006 23:14:18 +0000 Subject: [PATCH] This update fixes 7531 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47348 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main/channel.c b/main/channel.c index 865c9ca758..8db899747f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3859,7 +3859,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)); }