[svn-commits] murf: branch 1.4 r47348 - /branches/1.4/main/channel.c

[svn-commits at lists.digium.com]

Author: murf
Date: Wed Nov  8 17:14:18 2006
New Revision: 47348

URL: http://svn.digium.com/view/asterisk?rev=47348&view=rev
Log:
This update fixes 7531

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?rev=47348&r1=47347&r2=47348&view=diff
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Wed Nov  8 17:14:18 2006
@@ -3859,7 +3859,11 @@
 						bridge_playfile(c1, c0, config->warning_sound, t);
 				}
 				if (config->warning_freq) {
-					nexteventts = ast_tvadd(nexteventts, ast_samp2tv(config->warning_freq, 1000));
+
+					if (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));
 			}