diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 18:54:01 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 18:54:01 +0000 |
| commit | f792e412f6c2deb13e87d337a485dac001b2df34 (patch) | |
| tree | 5a6fbc7d36c37b0eddef93e258e556d7898954c3 /apps/app_queue.c | |
| parent | f188aacf466bb06a395397e16b0e67fb6e78ab72 (diff) | |
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)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122313 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
| -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 2c5375fc4..6d61e8e52 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1847,8 +1847,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; |