[asterisk-commits] mmichelson: branch 1.6.0 r122313 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jun 12 13:54:01 2008
New Revision: 122313

URL: http://svn.digium.com/view/asterisk?view=rev&rev=122313
Log:
Merged revisions 122312 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r122312 | mmichelson | 2008-06-12 13:53:17 -0500 (Thu, 12 Jun 2008) | 17 lines

Merged revisions 122311 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r122311 | mmichelson | 2008-06-12 13:50:58 -0500 (Thu, 12 Jun 2008) | 9 lines

Properly play a holdtime message if the announce-holdtime option is
set to "once."

(closes issue #12842)
Reported by: ramonpeek
Patches:
      patch001.diff uploaded by ramonpeek (license 266)


........

................

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

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

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=122313&r1=122312&r2=122313
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Thu Jun 12 13:54:01 2008
@@ -1847,8 +1847,9 @@
 
 	/* 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;