automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44311 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 3 deletions

diff --git a/apps/app_queue.c b/apps/app_queue.c
index ec53d6641..1e5fd8306 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;