]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Register CLI commands before parsing config, in case there is a config error.
authorJason Parker <jparker@digium.com>
Thu, 12 Aug 2010 22:49:28 +0000 (22:49 +0000)
committerJason Parker <jparker@digium.com>
Thu, 12 Aug 2010 22:49:28 +0000 (22:49 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@282129 65c4cc65-6c06-0410-ace0-fbb531ad65f3

pbx/pbx_config.c

index 9c51b130c4fd7ba95402876b482dd270f0eae934..0bcdf78117a8de36321ea07ba2c2cacd4adba05f 100644 (file)
@@ -2475,13 +2475,14 @@ 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, sizeof(cli_pbx_config) / sizeof(struct ast_cli_entry));
 
+       if (pbx_load_module())
+               return AST_MODULE_LOAD_DECLINE;
+
        return 0;
 }