[svn-commits] russell: branch 1.4 r46370 - /branches/1.4/channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: russell
Date: Fri Oct 27 14:03:32 2006
New Revision: 46370

URL: http://svn.digium.com/view/asterisk?rev=46370&view=rev
Log:
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:
    branches/1.4/channels/chan_zap.c

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?rev=46370&r1=46369&r2=46370&view=diff
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Fri Oct 27 14:03:32 2006
@@ -10418,9 +10418,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))
@@ -11151,6 +11148,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);