Merged revisions 335434 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Mon, 12 Sep 2011 15:56:27 +0000 (15:56 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Mon, 12 Sep 2011 15:56:27 +0000 (15:56 +0000)
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335434 | mnicholson | 2011-09-12 10:55:48 -0500 (Mon, 12 Sep 2011) | 13 lines

  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/trunk@335435 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index 5275f9e..4015e80 100644 (file)
@@ -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;