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.4@179536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Jeff Peeler 17 years ago
parent dadbbb0a56
commit 4055ec6c57

@ -4110,7 +4110,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));

Loading…
Cancel
Save