aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index 654f82419..7983c4216 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4563,7 +4563,7 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
o0nativeformats = c0->nativeformats;
o1nativeformats = c1->nativeformats;
- if (config->feature_timer) {
+ if (config->feature_timer && !ast_tvzero(config->nexteventts)) {
config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->feature_timer, 1000));
} else if (config->timelimit && firstpass) {
config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000));