diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-10-27 19:04:34 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-10-27 19:04:34 +0000 |
| commit | 955f1ef0fe65d9b9ef5a498d37c72ae8112df72c (patch) | |
| tree | 1b7e140efd7e40b8659ea9e6fdbe20e6543ef01b /channels | |
| parent | 95a4fc7af2a0cc7f88fea9d5bfdba465afab4d1d (diff) | |
Merged revisions 46370 via svnmerge from
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
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 2425c7508..e5c7c461e 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -11644,9 +11644,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; @@ -12417,6 +12414,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); |