diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-05 23:09:25 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-05 23:09:25 +0000 |
| commit | a876a3d85d249699de942e1f8d9b4a3ebafe314f (patch) | |
| tree | 6334813dc18381d02cc8cd4150348ed2f7391d18 /apps | |
| parent | d074c76532a2ecfa62ecdae1bed906029060aac7 (diff) | |
Merged revisions 237920 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r237920 | dvossel | 2010-01-05 17:08:50 -0600 (Tue, 05 Jan 2010) | 16 lines
fixes holdtime playback issue in app_queue
When reporting hold time, the number of seconds should be mod 60.
Otherwise audio playback could be something like "2 minutes 123 seconds"
rather than "2 minutes 3 seconds".
Also, the "minute" sound file is missing, so for the moment until
that file can be created the "minutes" file is used instead.
(closes issue #16168)
Reported by: nickilo
Patches:
patch-unified-trunk-rev-222176 uploaded by nickilo (license )
Tested by: nickilo, wonderg
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237921 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 23f54b7e6..e16993ffd 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3904,11 +3904,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce time(&now); holdtime = abs((now - qe->start) / 60); - holdtimesecs = abs((now - qe->start)); - if (holdtime == 1) { - ast_say_number(peer, holdtime, AST_DIGIT_ANY, peer->language, NULL); - play_file(peer, qe->parent->sound_minute); - } else { + holdtimesecs = abs((now - qe->start) % 60); + if (holdtime > 0) { ast_say_number(peer, holdtime, AST_DIGIT_ANY, peer->language, NULL); play_file(peer, qe->parent->sound_minutes); } |