[svn-commits] russell: trunk r164525 - /trunk/channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Dec 15 16:25:46 2008
New Revision: 164525

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164525
Log:
Open a timer before loading configuration so that the trunking configuration option
will take effect.

(closes issue #14082)
Reported by: seandarcy

Modified:
    trunk/channels/chan_iax2.c

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=164525&r1=164524&r2=164525
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Dec 15 16:25:46 2008
@@ -12573,12 +12573,13 @@
 	ast_manager_register( "IAXnetstats", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_netstats, "Show IAX Netstats" );
 	ast_manager_register( "IAXregistry", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_registry, "Show IAX registrations");
 
-	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)) {