[asterisk-commits] lmadsen: trunk r323214 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon Jun 13 14:54:27 2011
New Revision: 323214

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323214
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=323214&r1=323213&r2=323214
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Jun 13 14:54:27 2011
@@ -7387,7 +7387,7 @@
 		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',