mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Merged revisions 46744 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r46744 | russell | 2006-11-01 11:39:09 -0500 (Wed, 01 Nov 2006) | 2 lines Prevent an infinite loop when config processing gets to a jitterbuffer option ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -11656,7 +11656,7 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
|
||||
int y;
|
||||
int found_pseudo = 0;
|
||||
|
||||
while(v) {
|
||||
for (; v; v = v->next) {
|
||||
if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
|
||||
continue;
|
||||
|
||||
@@ -12320,7 +12320,6 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
|
||||
}
|
||||
} else if (!skipchannels)
|
||||
ast_log(LOG_WARNING, "Ignoring %s\n", v->name);
|
||||
v = v->next;
|
||||
}
|
||||
if (!found_pseudo && reload == 0) {
|
||||
/* Make sure pseudo isn't a member of any groups if
|
||||
|
Reference in New Issue
Block a user