[asterisk-commits] file: trunk r49677 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Jan  5 16:18:03 2007
New Revision: 49677

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

........

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

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=49677&r1=49676&r2=49677
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Jan  5 16:18:03 2007
@@ -3876,13 +3876,9 @@
 					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));
 			}
 		}