diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-05 22:18:03 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-05 22:18:03 +0000 |
| commit | e37f8f077ac812a2007cae698e0a67785d473f17 (patch) | |
| tree | 911f4d5104bd7a7b808f43d86600f67f95d83722 /main | |
| parent | 5fb9f8ae1cea593a8a503a767cc7046665f2ece3 (diff) | |
Merged revisions 49675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49675 | file | 2007-01-05 17:14:47 -0500 (Fri, 05 Jan 2007) | 2 lines
Don't keep repeating the warning over and over when the end of the call is reached. (issue #8724 reported by xrg)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49677 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/main/channel.c b/main/channel.c index 3cf8052b2..725aa90ee 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3876,13 +3876,9 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha if (callee_warning) bridge_playfile(c1, c0, config->warning_sound, t); } - if (config->warning_freq) { - - if (time_left_ms > (config->warning_freq + 5000)) { - nexteventts = ast_tvadd(nexteventts, ast_samp2tv(config->warning_freq, 1000)); - } - - } else + if (config->warning_freq && (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)); } } |