From: Jason Parker <jparker@digium.com>
Date: Thu, 12 Aug 2010 22:52:33 +0000 (+0000)
Subject: Merged revisions 282131 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2463
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=377c3bf88ee9888ca51dfe53ba66eda34f79ce0b;p=thirdparty%2Fasterisk.git

Merged revisions 282131 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282131 | qwell | 2010-08-12 17:51:44 -0500 (Thu, 12 Aug 2010) | 16 lines

  Merged revisions 282130 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r282130 | qwell | 2010-08-12 17:50:54 -0500 (Thu, 12 Aug 2010) | 9 lines

    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/trunk@282132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index ed1a2cd8c4..1617d5f866 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1737,13 +1737,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;
 }