From e0a8394e8e4da4d76449bd567d0fc8c8b50fdff0 Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Mon, 12 Sep 2011 15:55:48 +0000 Subject: [PATCH] Merged revisions 335433 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r335433 | mnicholson | 2011-09-12 10:54:41 -0500 (Mon, 12 Sep 2011) | 6 lines Properly set caller_warning and callee_warning before we try to use them. ASTERISK-18199 Patch by: elguero Testing by: rtang ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@335434 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/channel.c b/main/channel.c index 5275f9ec38..4015e80a1e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7454,6 +7454,9 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha return -1; } + caller_warning = ast_test_flag(&config->features_caller, AST_FEATURE_PLAY_WARNING); + callee_warning = ast_test_flag(&config->features_callee, AST_FEATURE_PLAY_WARNING); + if (ast_tvzero(config->start_time)) { config->start_time = ast_tvnow(); if (config->start_sound) { @@ -7476,8 +7479,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha config->nexteventts = ast_tvadd(config->feature_start_time, ast_samp2tv(config->feature_timer, 1000)); } else if (config->timelimit) { time_left_ms = config->timelimit - ast_tvdiff_ms(ast_tvnow(), config->start_time); - caller_warning = ast_test_flag(&config->features_caller, AST_FEATURE_PLAY_WARNING); - callee_warning = ast_test_flag(&config->features_callee, AST_FEATURE_PLAY_WARNING); config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000)); if ((caller_warning || callee_warning) && config->play_warning) { long next_warn = config->play_warning;