Merged revisions 174951 via svnmerge from

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

........
  r174951 | mmichelson | 2009-02-11 17:12:57 -0600 (Wed, 11 Feb 2009) | 3 lines
  
  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/branches/1.6.1@174952 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

@@ -1948,11 +1948,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: