From e486316dc6367aa3289a4d1955a233a02e65c258 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 3 Oct 2006 20:19:32 +0000 Subject: Merged revisions 44298 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r44298 | kpfleming | 2006-10-03 15:18:29 -0500 (Tue, 03 Oct 2006) | 10 lines Merged revisions 44296 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r44296 | kpfleming | 2006-10-03 15:14:13 -0500 (Tue, 03 Oct 2006) | 2 lines fix a logic error in my previous fix to the queue reload code ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44299 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'apps/app_queue.c') diff --git a/apps/app_queue.c b/apps/app_queue.c index e3b6ea605..0895476a7 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3807,11 +3807,15 @@ static int reload_queues(void) } /* Free remaining members marked as delme */ - for (prev = NULL, cur = q->members, next = cur ? cur->next : NULL; + for (prev = NULL, cur = q->members; cur; - cur = next, next = cur ? cur->next : NULL) { - if (!cur->delme) + cur = next) { + next = cur->next; + + if (!cur->delme) { + prev = cur; continue; + } if (prev) prev->next = next; -- cgit v1.2.3