From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 11 Feb 2009 23:12:57 +0000 (+0000)
Subject: Fix a bit of odd logic for announcing position. Sync with 1.6.0's logic
X-Git-Tag: 1.6.2.0-beta1~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d5da5f436cb0ceb61a1f5b0711443b7e99b436f;p=thirdparty%2Fasterisk.git

Fix a bit of odd logic for announcing position. Sync with 1.6.0's logic



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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index eb02322c2d..4bcf36b4c3 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -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: