diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 00:04:10 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 00:04:10 +0000 |
| commit | c0eca9beee008ec5d092ac397d8a7b6d029412f4 (patch) | |
| tree | b9a00f90cfef953dd4bf30f1c59a2751f4da37a9 | |
| parent | 7ab8d11383f38b86588d3c487ab2960f02fd765b (diff) | |
Merged revisions 179537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r179537 | jpeeler | 2009-03-02 18:01:51 -0600 (Mon, 02 Mar 2009) | 21 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@179539 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 118fc5b44..fa75a043f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4559,7 +4559,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)); |