From: Joshua Colp <jcolp@digium.com>
Date: Thu, 5 Jul 2007 13:23:49 +0000 (+0000)
Subject: Merged revisions 73316 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=758873a06832c99beee7a91e9ee4824a83684cb3;p=thirdparty%2Fasterisk.git

Merged revisions 73316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r73316 | file | 2007-07-05 10:22:13 -0300 (Thu, 05 Jul 2007) | 10 lines

Merged revisions 73315 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73315 | file | 2007-07-05 10:19:17 -0300 (Thu, 05 Jul 2007) | 2 lines

Reset ServicelevelPerf variable back to 0 if we are unable to calculate it each time... otherwise we will get previous values. (issue #10117 reported by noriyuki)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 425f3c64a1..32091e92a5 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4351,8 +4351,7 @@ static int manager_queues_status(struct mansession *s, const struct message *m)
 
 		/* List queue properties */
 		if (ast_strlen_zero(queuefilter) || !strcmp(q->name, queuefilter)) {
-			if (q->callscompleted > 0)
-				sl = 100 * ((float) q->callscompletedinsl / (float) q->callscompleted);
+			sl = ((q->callscompleted > 0) ? 100 * ((float)q->callscompletedinsl / (float)q->callscompleted) : 0);
 			astman_append(s, "Event: QueueParams\r\n"
 				"Queue: %s\r\n"
 				"Max: %d\r\n"