diff options
| author | Leif Madsen <leif@leifmadsen.com> | 2011-06-13 19:54:27 +0000 |
|---|---|---|
| committer | Leif Madsen <leif@leifmadsen.com> | 2011-06-13 19:54:27 +0000 |
| commit | dafa8a659b09495ff77ee2cb58fe385428465b17 (patch) | |
| tree | b573a2cffcaf4bb6f3ad0ca1a49a1ebe38868cb1 /main/channel.c | |
| parent | 0bd877621e6fff640962026b1420f10c16a3fa14 (diff) | |
Merged revisions 323213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r323213 | lmadsen | 2011-06-13 15:51:52 -0400 (Mon, 13 Jun 2011) | 6 lines
Avoid dividing by zero with L() option to Dial()
Reported by: nicolasom
Patches:
issue-17995.patch - nicolasom (License #5994)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323214 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 9c9d6ca5a..47ebe9b80 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7387,7 +7387,7 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000)); if ((caller_warning || callee_warning) && config->play_warning) { long next_warn = config->play_warning; - if (time_left_ms < config->play_warning) { + if (time_left_ms < config->play_warning && config->warning_freq > 0) { /* At least one warning was played, which means we are returning after feature */ long warns_passed = (config->play_warning - time_left_ms) / config->warning_freq; /* It is 'warns_passed * warning_freq' NOT '(warns_passed + 1) * warning_freq', |