aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_queue.c
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-15 16:17:19 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-15 16:17:19 +0000
commit70bd83ed2ebc1303ba34254f6627f5fc6f368dfc (patch)
tree117e4390eb127e375d935754cafa1b3fed1742dc /apps/app_queue.c
parent8fc847620809c1aba8ef11af4ee3bf18814ef7d6 (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.0@164271 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
-rw-r--r--apps/app_queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 2fa0a940b..ed4447848 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -5558,7 +5558,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
@@ -5569,7 +5569,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])) {