From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 16 Jul 2010 21:16:51 +0000 (+0000)
Subject: Merged revisions 277488 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=481f5eddb56c10e9d2e71aae89a18e807bfdaf14;p=thirdparty%2Fasterisk.git

Merged revisions 277488 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r277488 | jpeeler | 2010-07-16 16:16:08 -0500 (Fri, 16 Jul 2010) | 10 lines

  Fix reporting estimated queue hold time.

  Just say the number of seconds (after minutes) rather than doing some incorrect
  calculation with respect to minutes.

  (closes issue #17498)
  Reported by: corruptor
  Patches:
        holdesecs_bug.diff uploaded by corruptor (license 253)
........


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 2f9b7c28f5..32adfd7a30 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2192,7 +2192,7 @@ static int say_position(struct queue_ent *qe, int ringing)
 			}
 		}
 		if (avgholdsecs >= 1) {
-			res = ast_say_number(qe->chan, avgholdmins > 1 ? avgholdsecs : avgholdmins * 60 + avgholdsecs, AST_DIGIT_ANY, qe->chan->language, NULL);
+			res = ast_say_number(qe->chan, avgholdsecs, AST_DIGIT_ANY, qe->chan->language, NULL);
 			if (res)
 				goto playout;