Don't keep repeating the warning over and over when the end of the call is reached...

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

diff --git a/main/channel.c b/main/channel.c
index 18a5b78054d315e05407f47fdccb6ea5cfc525a1..e895d27831060bb9336a1775b8438f479be9cde7 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3864,13 +3864,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));
                        }
                }