[asterisk-commits] qwell: branch 1.6.2 r282130 - in /branches/1.6.2: ./ pbx/pbx_config.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Aug 12 17:50:54 2010
New Revision: 282130

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282130
Log:
Merged revisions 282129 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r282129 | qwell | 2010-08-12 17:49:28 -0500 (Thu, 12 Aug 2010) | 1 line
  
  Register CLI commands before parsing config, in case there is a config error.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/pbx/pbx_config.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Aug 12 17:50:54 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911
+/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129

Modified: branches/1.6.2/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/pbx/pbx_config.c?view=diff&rev=282130&r1=282129&r2=282130
==============================================================================
--- branches/1.6.2/pbx/pbx_config.c (original)
+++ branches/1.6.2/pbx/pbx_config.c Thu Aug 12 17:50:54 2010
@@ -1738,12 +1738,12 @@
 
 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, ARRAY_LEN(cli_pbx_config));
+
+	if (pbx_load_module())
+		return AST_MODULE_LOAD_DECLINE;
 
 	return AST_MODULE_LOAD_SUCCESS;
 }