Fix bridging regression from commit 176701

This fixes a bad regression where the bridge would exit after an attended
transfer was made. The problem was due to nexteventts getting set after the
masquerade which caused the bridge to return AST_BRIDGE_COMPLETE.

(closes issue #14315)
Reported by: tim_ringenbach

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

diff --git a/main/channel.c b/main/channel.c
index 33f7558f78e145996f12d6e57d7b1b7b7415b988..ef74d653cad4acfff784fa754b784b7ebbb13aa2 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -4110,7 +4110,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));