[svn-commits] russell: trunk r46371 - in /trunk: ./ channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: russell
Date: Fri Oct 27 14:04:34 2006
New Revision: 46371

URL: http://svn.digium.com/view/asterisk?rev=46371&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=46371&r1=46370&r2=46371&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri Oct 27 14:04:34 2006
@@ -11643,9 +11643,6 @@
 	char *ringc;
 	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))
@@ -12417,6 +12414,10 @@
 		}
 	}
 #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);