[asterisk-commits] russell: branch 1.6.1 r164527 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Dec 15 16:27:19 2008
New Revision: 164527

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164527
Log:
Merged revisions 164525 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r164525 | russell | 2008-12-15 16:25:46 -0600 (Mon, 15 Dec 2008) | 6 lines

Open a timer before loading configuration so that the trunking configuration option
will take effect.

(closes issue #14082)
Reported by: seandarcy

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=164527&r1=164526&r2=164527
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Mon Dec 15 16:27:19 2008
@@ -12443,12 +12443,13 @@
 	ast_manager_register( "IAXpeerlist", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_peer_list, "List IAX Peers" );
 	ast_manager_register( "IAXnetstats", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_netstats, "Show IAX Netstats" );
 
-	if(set_config(config, 0) == -1)
-		return AST_MODULE_LOAD_DECLINE;
-
 	timingfd = ast_timer_open();
 	if (timingfd > -1) {
 		ast_timer_set_rate(timingfd, trunkfreq);
+	}
+
+	if (set_config(config, 0) == -1) {
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
  	if (ast_channel_register(&iax2_tech)) {