[asterisk-commits] mmichelson: branch 1.6.1 r174952 - in /branches/1.6.1: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Feb 11 17:13:21 2009
New Revision: 174952

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=174952
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_queue.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=174952&r1=174951&r2=174952
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Wed Feb 11 17:13:21 2009
@@ -1948,11 +1948,11 @@
 	}
 
 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: