diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2017-09-28 17:37:15 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2017-09-28 18:47:58 -0500 |
| commit | 699b6a70d566aa94b177f5dfc7d94c24a0beff97 (patch) | |
| tree | f67ea2e54774df333bdd602029e18d02fb502bc4 | |
| parent | 88ba803110d8e25d0f5286279ab4745d4a2512e3 (diff) | |
app_queue.c: Fix announcements when announce-to-first-user not enabled.
The previous patch for ASTERISK-27216 made it so you wouldn't get any
position or periodic announcements unless you had announce-to-first-user
enabled. The announce-to-first-user feature was added by ASTERISK_21782
as a result of the patch which introduced the redundant announcements that
ASTERISK-27216 removes.
* By noting that the makeannouncement variable is used to suppresses the
first user announcement, we set its initial value to the
announce-to-first-user enable setting.
ASTERISK-27216
Change-Id: Ieaeb7dbea8ae7073086b775fbafe0625b000b10a
| -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; } } |