[svn-commits] mmichelson: branch 1.6.1 r164274 - in /branches/1.6.1: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Dec 15 10:18:38 2008
New Revision: 164274

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164274
Log:
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


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_queue.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=164274&r1=164273&r2=164274
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Mon Dec 15 10:18:38 2008
@@ -5649,7 +5649,7 @@
 	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 @@
 			ao2_unlock(q);
 			queue_unref(q);
 			continue;
-		} else {
+		} else if (q->realtime) {
 			queue_unref(realtime_queue);
 		}
 		if (argc == 3 && strcasecmp(q->name, argv[2])) {