diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-15 16:18:38 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-15 16:18:38 +0000 |
| commit | eb85ac3e1325ce05564277952aabda05bde9d415 (patch) | |
| tree | 5b2dada11dbdd6d925fd1bd6e55ef6d0f9108c32 | |
| parent | a03e9f5e35747e00d58d442a8e390b6019fcb9a3 (diff) | |
Merged revisions 164270 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r164270 | mmichelson | 2008-12-15 10:16:47 -0600 (Mon, 15 Dec 2008) | 4 lines
Fix a compile warning and a logic error that could have been bad
for non-realtime queues
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@164274 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 08827445c..88a99bf1c 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -5649,7 +5649,7 @@ static char *__queues_show(struct mansession *s, int fd, int argc, char **argv) ao2_lock(queues); while ((q = ao2_iterator_next(&queue_iter))) { float sl; - struct call_queue *realtime_queue; + struct call_queue *realtime_queue = NULL; ao2_lock(q); /* This check is to make sure we don't print information for realtime @@ -5660,7 +5660,7 @@ static char *__queues_show(struct mansession *s, int fd, int argc, char **argv) ao2_unlock(q); queue_unref(q); continue; - } else { + } else if (q->realtime) { queue_unref(realtime_queue); } if (argc == 3 && strcasecmp(q->name, argv[2])) { |