[svn-commits] qwell: branch 1.4 r282129 - /branches/1.4/pbx/pbx_config.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Aug 12 17:49:28 2010
New Revision: 282129

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282129
Log:
Register CLI commands before parsing config, in case there is a config error.

Modified:
    branches/1.4/pbx/pbx_config.c

Modified: branches/1.4/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/pbx/pbx_config.c?view=diff&rev=282129&r1=282128&r2=282129
==============================================================================
--- branches/1.4/pbx/pbx_config.c (original)
+++ branches/1.4/pbx/pbx_config.c Thu Aug 12 17:49:28 2010
@@ -2475,12 +2475,13 @@
 
 static int load_module(void)
 {
-	if (pbx_load_module())
-		return AST_MODULE_LOAD_DECLINE;
- 
+
 	if (static_config && !write_protect_config)
 		ast_cli_register(&cli_dialplan_save);
 	ast_cli_register_multiple(cli_pbx_config, sizeof(cli_pbx_config) / sizeof(struct ast_cli_entry));
+
+	if (pbx_load_module())
+		return AST_MODULE_LOAD_DECLINE;
 
 	return 0;
 }