From b5a569a1225c44473e84223aa84f66b6fe19f4a8 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Tue, 3 Mar 2009 00:03:36 +0000 Subject: 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.0@179538 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/channel.c') 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)); -- cgit v1.2.3