From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 3 Oct 2006 20:19:32 +0000 (+0000)
Subject: Merged revisions 44298 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4529
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e486316dc6367aa3289a4d1955a233a02e65c258;p=thirdparty%2Fasterisk.git

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
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index e3b6ea6053..0895476a72 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;