Fix a bit of odd logic for announcing position. Sync with 1.6.0's logic
authorMark Michelson <mmichelson@digium.com>
Wed, 11 Feb 2009 23:12:57 +0000 (23:12 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 11 Feb 2009 23:12:57 +0000 (23:12 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@174951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

index eb02322..4bcf36b 100644 (file)
@@ -2126,11 +2126,11 @@ static int say_position(struct queue_ent *qe, int ringing)
        }
 
 posout:
-       if (announceposition == 1 || say_thanks) {
-               if (qe->parent->announceposition) {
-                       ast_verb(3, "Told %s in %s their queue position (which was %d)\n",
-                               qe->chan->name, qe->parent->name, qe->pos);
-               }
+       if (qe->parent->announceposition) {
+               ast_verb(3, "Told %s in %s their queue position (which was %d)\n",
+                       qe->chan->name, qe->parent->name, qe->pos);
+       }
+       if (say_thanks) {
                res = play_file(qe->chan, qe->parent->sound_thanks);
        }
 playout: