[asterisk-commits] file: branch 1.4 r49675 - /branches/1.4/main/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Jan  5 16:14:47 2007
New Revision: 49675

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49675
Log:
Don't keep repeating the warning over and over when the end of the call is reached. (issue #8724 reported by xrg)

Modified:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/channel.c?view=diff&rev=49675&r1=49674&r2=49675
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Fri Jan  5 16:14:47 2007
@@ -3864,13 +3864,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));
 			}
 		}