diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-06-12 18:53:17 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-06-12 18:53:17 +0000 |
| commit | 054f08a1c8bae644becefe02c5f6f093afe6ab40 (patch) | |
| tree | 334d17a3c0f847b7501a5d0cf6d795fd5a2fdcce /apps | |
| parent | 968cf2b578e4124b5cefc72364c23fdb663ecead (diff) | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index d8471a1a1..369dbe975 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -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 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; |