From: Jason Parker <jparker@digium.com>
Date: Thu, 12 Aug 2010 22:50:54 +0000 (+0000)
Subject: Merged revisions 282129 via svnmerge from
X-Git-Tag: 1.6.2.12-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4f594ee152a6d2113a9094c01356a60467e2e7;p=thirdparty%2Fasterisk.git

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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@282130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index ae409edfdd..aeb69638dd 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1738,13 +1738,13 @@ static int pbx_load_module(void)
 
 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;
 }