This change had somehow gotten reverted due to a

completely unrelated commit. Thanks to Theo Belder
on the Asterisk-dev list for pointing this out.

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index da97d5ca9f488205e02fd224272aca4eea32d58b..a0603abe41b95fba054f1d9d274b0c39cf30f663 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1577,8 +1577,9 @@ static int say_position(struct queue_ent *qe)
 
        /* If the hold time is >1 min, if it's enabled, and if it's not
           supposed to be only once and we have already said it, say it */
-       if ((avgholdmins+avgholdsecs) > 0 && (qe->parent->announceholdtime) &&
-               (!(qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE) && qe->last_pos)) {
+    if ((avgholdmins+avgholdsecs) > 0 && qe->parent->announceholdtime &&
+        ((qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE && !qe->last_pos) ||
+        !(qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE))) {
                res = play_file(qe->chan, qe->parent->sound_holdtime);
                if (res)
                        goto playout;