aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-30 21:41:06 +0000
committermnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-30 21:41:06 +0000
commitf83de494325b01669c3693eb3dcc26938450c3d6 (patch)
tree0f8756d03ca3d85f3e6408f7550471cb19ad8b9d /apps
parentf27d39ae7847043558420386fe7143e5228513e7 (diff)
Merged revisions 221436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r221436 | mnick | 2009-09-30 16:15:01 -0500 (Wed, 30 Sep 2009) | 2 lines Prevents from division by zero ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@221470 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 85102a930..03251199a 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2499,7 +2499,7 @@ static int say_periodic_announcement(struct queue_ent *qe, int ringing)
ast_verb(3, "Playing periodic announcement\n");
- if (qe->parent->randomperiodicannounce) {
+ if (qe->parent->randomperiodicannounce && qe->parent->numperiodicannounce) {
qe->last_periodic_announce_sound = ((unsigned long) ast_random()) % qe->parent->numperiodicannounce;
} else if (qe->last_periodic_announce_sound >= qe->parent->numperiodicannounce ||
ast_strlen_zero(qe->parent->sound_periodicannounce[qe->last_periodic_announce_sound]->str)) {