From: Automerge script <automerge@asterisk.org>
Date: Tue, 3 Oct 2006 21:02:12 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.13-netsec~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c63cf7f5c167045e5bf15a341a33609ec0b777;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index ec53d66415..1e5fd8306b 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3405,11 +3405,15 @@ static void 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;