[svn-commits] jpeeler: branch 1.6.0 r179538 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Mar  2 18:03:36 2009
New Revision: 179538

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=179538&r1=179537&r2=179538
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Mon Mar  2 18:03:36 2009
@@ -4563,7 +4563,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));