diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-02-16 18:04:34 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-02-16 18:04:34 +0000 |
| commit | 84718d10c4e16dd57edd6dc161a5d20789bdd0d4 (patch) | |
| tree | e43020090bea2234f6810cf1ddd540a3779f137e /pbx | |
| parent | a8309d1a3c9b3b857449fd3b89a92c5ed5a28719 (diff) | |
Merged revisions 54898 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r54898 | russell | 2007-02-16 12:03:41 -0600 (Fri, 16 Feb 2007) | 4 lines
Fix setting "autofallthrough" to yes by default. It was set to enabled in
pbx.c. However, if the option was not present in extensions.conf, then
pbx_config.c would set it back to disabled.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index d1b45cfba..6bf1a6053 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -48,7 +48,7 @@ static char userscontext[AST_MAX_EXTENSION] = "default"; static int static_config = 0; static int write_protect_config = 1; -static int autofallthrough_config = 0; +static int autofallthrough_config = 1; static int clearglobalvars_config = 0; AST_MUTEX_DEFINE_STATIC(save_dialplan_lock); @@ -1337,6 +1337,7 @@ static int pbx_load_config(const char *config_file) struct ast_context *con; struct ast_variable *v; const char *cxt; + const char *aft; cfg = ast_config_load(config_file); if (!cfg) @@ -1345,7 +1346,8 @@ static int pbx_load_config(const char *config_file) /* Use existing config to populate the PBX table */ static_config = ast_true(ast_variable_retrieve(cfg, "general", "static")); write_protect_config = ast_true(ast_variable_retrieve(cfg, "general", "writeprotect")); - autofallthrough_config = ast_true(ast_variable_retrieve(cfg, "general", "autofallthrough")); + if ((aft = ast_variable_retrieve(cfg, "general", "autofallthrough"))) + autofallthrough_config = ast_true(aft); clearglobalvars_config = ast_true(ast_variable_retrieve(cfg, "general", "clearglobalvars")); ast_set2_flag(&ast_options, ast_true(ast_variable_retrieve(cfg, "general", "priorityjumping")), AST_OPT_FLAG_PRIORITY_JUMPING); |