From: Joshua Colp <jcolp@digium.com>
Date: Fri, 5 Jan 2007 22:18:03 +0000 (+0000)
Subject: Merged revisions 49675 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3548
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c3429b07b9db7be2df683660a745653bb05906;p=thirdparty%2Fasterisk.git

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)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index 3cf8052b25..725aa90ee9 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3876,13 +3876,9 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
 					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));
 			}
 		}