<p>Kevin Harwell <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13294">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">parking: Fall back to parker channel name even if it matches parkee.<br><br>ASTERISK-28631<br><br>Change-Id: Ia74d084799fbb9bee3403e30d2391aacd46243cc<br>---<br>M res/parking/parking_bridge.c<br>1 file changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c</span><br><span>index 981ef81..4e56d58 100644</span><br><span>--- a/res/parking/parking_bridge.c</span><br><span>+++ b/res/parking/parking_bridge.c</span><br><span>@@ -274,10 +274,15 @@</span><br><span>   blind_transfer = ast_strdupa(S_OR(blind_transfer, ""));</span><br><span>    ast_channel_unlock(bridge_channel->chan);</span><br><span>         if (!parker || !strcmp(parker->name, ast_channel_name(bridge_channel->chan))) {</span><br><span style="color: hsl(0, 100%, 40%);">-           /* Even if there is no BLINDTRANSFER dialplan variable then blind_transfer will</span><br><span style="color: hsl(0, 100%, 40%);">-          * be an empty string.</span><br><span style="color: hsl(0, 100%, 40%);">-           */</span><br><span style="color: hsl(0, 100%, 40%);">-             parker_channel_name = blind_transfer;</span><br><span style="color: hsl(120, 100%, 40%);">+         if (ast_strlen_zero(blind_transfer) && parker) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      /* If no BLINDTRANSFER exists but the parker does then use their channel name */</span><br><span style="color: hsl(120, 100%, 40%);">+                      parker_channel_name = parker->name;</span><br><span style="color: hsl(120, 100%, 40%);">+                } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                      /* Even if there is no BLINDTRANSFER dialplan variable then blind_transfer will</span><br><span style="color: hsl(120, 100%, 40%);">+                        * be an empty string.</span><br><span style="color: hsl(120, 100%, 40%);">+                         */</span><br><span style="color: hsl(120, 100%, 40%);">+                   parker_channel_name = blind_transfer;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span>    } else {</span><br><span>             parker_channel_name = parker->name;</span><br><span>       }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13294">change 13294</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/13294"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: certified/13.21 </div>
<div style="display:none"> Gerrit-Change-Id: Ia74d084799fbb9bee3403e30d2391aacd46243cc </div>
<div style="display:none"> Gerrit-Change-Number: 13294 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>