diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-10-04 14:52:26 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-04 14:52:26 -0500 |
| commit | 0991cb0a8fc99a356683f4efa701ac21bfdc46ac (patch) | |
| tree | 01d612fdbe5c6bf6fe80215fb4598e2fa8c66fa8 | |
| parent | 44d443d87e2363a82ad9433f8b5ebb19f65cb44d (diff) | |
| parent | 699b6a70d566aa94b177f5dfc7d94c24a0beff97 (diff) | |
Merge "app_queue.c: Fix announcements when announce-to-first-user not enabled." into 14
| -rw-r--r-- | apps/app_queue.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 80a013c79..1eb8551b7 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -8081,7 +8081,7 @@ check_turns: goto stop; } - makeannouncement = 0; + makeannouncement = qe.parent->announce_to_first_user; for (;;) { /* This is the wait loop for the head caller*/ @@ -8101,15 +8101,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; } } |