mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-19 03:07:59 +00:00
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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@122312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1861,8 +1861,9 @@ static int say_position(struct queue_ent *qe, int ringing)
|
|||||||
|
|
||||||
/* If the hold time is >1 min, if it's enabled, and if it's not
|
/* 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 */
|
supposed to be only once and we have already said it, say it */
|
||||||
if ((avgholdmins+avgholdsecs) > 0 && (qe->parent->announceholdtime) &&
|
if ((avgholdmins+avgholdsecs) > 0 && qe->parent->announceholdtime &&
|
||||||
(!(qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE) && qe->last_pos)) {
|
((qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE && !qe->last_pos) ||
|
||||||
|
!(qe->parent->announceholdtime == ANNOUNCEHOLDTIME_ONCE))) {
|
||||||
res = play_file(qe->chan, qe->parent->sound_holdtime);
|
res = play_file(qe->chan, qe->parent->sound_holdtime);
|
||||||
if (res)
|
if (res)
|
||||||
goto playout;
|
goto playout;
|
||||||
|
Reference in New Issue
Block a user