[asterisk-commits] mnicholson: trunk r335435 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Sep 12 10:56:27 2011
New Revision: 335435

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335435
Log:
Merged revisions 335434 via svnmerge from 
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
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=335435&r1=335434&r2=335435
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Sep 12 10:56:27 2011
@@ -7454,6 +7454,9 @@
 		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 @@
 		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;