diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-03 20:18:29 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-03 20:18:29 +0000 |
commit | d0ecdbc0e6148607c6e0fb99efca30460ebce5a4 (patch) | |
tree | 11a26e65feecf73264ebfef34b44f4f67fd4673c | |
parent | 03714ea2b8f4ebc6890f5d484b1087120d4e9da0 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.4@44298 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_queue.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index c6cd0f008..06c8ccaf8 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3825,11 +3825,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; |