Merged revisions 46370 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 27 Oct 2006 19:04:34 +0000 (19:04 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 27 Oct 2006 19:04:34 +0000 (19:04 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46370 | russell | 2006-10-27 14:03:32 -0500 (Fri, 27 Oct 2006) | 4 lines

move the copy of the default settings to the global settings back out of
process_zap, so that they aren't overwritten when process_zap is called
multiple times

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46371 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_zap.c

index 2425c75..e5c7c46 100644 (file)
@@ -11644,9 +11644,6 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
        int y;
        int found_pseudo = 0;
 
        int y;
        int found_pseudo = 0;
 
-       /* Copy the default jb config over global_jbconf */
-       memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
-
        while(v) {
                if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
                        continue;
        while(v) {
                if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
                        continue;
@@ -12417,6 +12414,10 @@ static int setup_zap(int reload)
                }
        }
 #endif
                }
        }
 #endif
+       
+       /* Copy the default jb config over global_jbconf */
+       memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
+
        v = ast_variable_browse(cfg, "channels");
        res = process_zap(v, reload, 0);
        ast_mutex_unlock(&iflock);
        v = ast_variable_browse(cfg, "channels");
        res = process_zap(v, reload, 0);
        ast_mutex_unlock(&iflock);