[svn-commits] jpeeler: trunk r179537 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Mar  2 18:01:51 2009
New Revision: 179537

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179537
Log:
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.
  
  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:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=179537&r1=179536&r2=179537
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Mar  2 18:01:51 2009
@@ -4585,7 +4585,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));