diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-02 23:54:39 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-02 23:54:39 +0000 |
| commit | 9643e9e89117bb786a927065a0b5e36bcdac4b0b (patch) | |
| tree | 172e2c6b1435fdaaba809c1efb85865ad6c0f3f6 | |
| parent | 7853685bebf3619ded417c462aa2f023e9c76a5e (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@179536 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 33f7558f7..ef74d653c 100644 --- 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)); |