kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 179537 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@179538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-03-03 00:03:36 +00:00
parent 49d2383e12
commit f355d2180a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/channel.c
View File

@@ -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));