From: Matthias Nick <mnick@digium.com>
Date: Wed, 30 Sep 2009 21:41:06 +0000 (+0000)
Subject: Merged revisions 221436 via svnmerge from
X-Git-Tag: 1.6.1.7-rc2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15e9856f8f6711006404e7976260272ff2bb6573;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@221470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 85102a930c..03251199a8 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)) {