Merged revisions 179536 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r179536 | jpeeler | 2009-03-02 17:54:39 -0600 (Mon, 02 Mar 2009) | 15 lines

  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/trunk@179537 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 303c42317d0b5deae783e369ba1af51c1ff1bb98..b7af47826347e172c984d65f242934461f735e9f 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -4585,7 +4585,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));