Merged revisions 54898 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 16 Feb 2007 18:04:34 +0000 (18:04 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 16 Feb 2007 18:04:34 +0000 (18:04 +0000)
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

pbx/pbx_config.c

index d1b45cf..6bf1a60 100644 (file)
@@ -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);