kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-06 13:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_queue.c: Fix announcements when announce-to-first-user not enabled." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-10-04 14:32:26 -05:00
committed by Gerrit Code Review
parent 29c442b587 0945f10d3b
commit 646d97f626
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_queue.c
View File

@@ -8042,7 +8042,7 @@ check_turns:
goto stop;
}
makeannouncement = 0;
makeannouncement = qe.parent->announce_to_first_user;
for (;;) {
/* This is the wait loop for the head caller*/
@@ -8062,15 +8062,17 @@ check_turns:
if (makeannouncement) {
/* Make a position announcement, if enabled */
if (qe.parent->announcefrequency && qe.parent->announce_to_first_user)
if ((res = say_position(&qe,ringing)))
if (qe.parent->announcefrequency) {
if ((res = say_position(&qe, ringing))) {
goto stop;
}
}
}
makeannouncement = 1;
/* Make a periodic announcement, if enabled */
if (qe.parent->periodicannouncefrequency && qe.parent->announce_to_first_user) {
if ((res = say_periodic_announcement(&qe,ringing))) {
if (qe.parent->periodicannouncefrequency) {
if ((res = say_periodic_announcement(&qe, ringing))) {
goto stop;
}
}