[svn-commits] jpeeler: branch 1.4 r179536 - /branches/1.4/main/channel.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Mar  2 17:54:39 2009
New Revision: 179536

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179536
Log:
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.

The problem is not completely solved however. A bridge configured with a warning
still does not operate correctly. It actually operates the same as before except
the DTMF is properly recognized after the first warning. I just wanted to get
this fix in as quickly as possible.

(issue #14315)
Reported by: tim_ringenbach


Modified:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/main/channel.c?view=diff&rev=179536&r1=179535&r2=179536
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Mon Mar  2 17:54:39 2009
@@ -4110,7 +4110,7 @@
 	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));