kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 282130 via svnmerge from

Browse Source 
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/branches/1.8@282131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2010-08-12 22:51:44 +00:00
parent 89872aac58
commit 8f739efcd4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pbx/pbx_config.c
View File

@@ -1737,13 +1737,13 @@ static int pbx_load_module(void)
static int load_module(void) static int load_module(void)
{ {
if (pbx_load_module())
return AST_MODULE_LOAD_DECLINE;
if (static_config && !write_protect_config) if (static_config && !write_protect_config)
ast_cli_register(&cli_dialplan_save); ast_cli_register(&cli_dialplan_save);
ast_cli_register_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config)); 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; return AST_MODULE_LOAD_SUCCESS;
} }