Merged revisions 182121 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r182121 | mmichelson | 2009-03-13 16:26:20 -0500 (Fri, 13 Mar 2009) | 6 lines

  Change faulty comparison used when announcing average hold minutes and seconds

  (closes issue #14227)
  Reported by: caspy
........

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

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