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/branches/1.4@46370 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f5508d34f2ada1bffddf71a33170e705bd4fc7ea..e23b5ddde52267afd85841c2517835de96462469 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10419,9 +10419,6 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
        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;
@@ -11151,6 +11148,10 @@ static int setup_zap(int reload)
                }
        }
 #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);