<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6636">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_queue.c: Fix announcements when announce-to-first-user not enabled.<br><br>The previous patch for ASTERISK-27216 made it so you wouldn't get any<br>position or periodic announcements unless you had announce-to-first-user<br>enabled.  The announce-to-first-user feature was added by ASTERISK_21782<br>as a result of the patch which introduced the redundant announcements that<br>ASTERISK-27216 removes.<br><br>* By noting that the makeannouncement variable is used to suppresses the<br>first user announcement, we set its initial value to the<br>announce-to-first-user enable setting.<br><br>ASTERISK-27216<br><br>Change-Id: Ieaeb7dbea8ae7073086b775fbafe0625b000b10a<br>---<br>M apps/app_queue.c<br>1 file changed, 7 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/apps/app_queue.c b/apps/app_queue.c<br>index b6079af..0efb2e6 100644<br>--- a/apps/app_queue.c<br>+++ b/apps/app_queue.c<br>@@ -8229,7 +8229,7 @@<br>                 goto stop;<br>    }<br> <br>- makeannouncement = 0;<br>+        makeannouncement = qe.parent->announce_to_first_user;<br> <br>   for (;;) {<br>            /* This is the wait loop for the head caller*/<br>@@ -8249,15 +8249,17 @@<br> <br>            if (makeannouncement) {<br>                       /* Make a position announcement, if enabled */<br>-                       if (qe.parent->announcefrequency && qe.parent->announce_to_first_user)<br>-                         if ((res = say_position(&qe,ringing)))<br>+                   if (qe.parent->announcefrequency) {<br>+                               if ((res = say_position(&qe, ringing))) {<br>                                         goto stop;<br>+                           }<br>+                    }<br>             }<br>             makeannouncement = 1;<br> <br>              /* Make a periodic announcement, if enabled */<br>-               if (qe.parent->periodicannouncefrequency && qe.parent->announce_to_first_user) {<br>-                       if ((res = say_periodic_announcement(&qe,ringing))) {<br>+            if (qe.parent->periodicannouncefrequency) {<br>+                       if ((res = say_periodic_announcement(&qe, ringing))) {<br>                            goto stop;<br>                    }<br>             }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6636">change 6636</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/6636"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ieaeb7dbea8ae7073086b775fbafe0625b000b10a </div>
<div style="display:none"> Gerrit-Change-Number: 6636 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>