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 ec53d6641545261b3beaba41bf69847d8fc79d3f..1e5fd8306b9a5cbb571a6a2f5474869b0c1e21f5 100644 (file)
--- 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;