<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6268">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Sean Bright: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit.<br><br>Change-Id: I13026cd90954e0265eab94a0faf635a3e11f0e35<br>---<br>M bridges/bridge_softmix.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c<br>index b359948..f11de6d 100644<br>--- a/bridges/bridge_softmix.c<br>+++ b/bridges/bridge_softmix.c<br>@@ -786,15 +786,15 @@<br> {<br> struct softmix_channel *sc;<br> struct softmix_bridge_data *softmix_data;<br>+<br> softmix_data = bridge->tech_pvt;<br> sc = bridge_channel->tech_pvt;<br>+ if (!sc) {<br>+ return;<br>+ }<br> <br> if (bridge->softmix.video_mode.mode == AST_BRIDGE_VIDEO_MODE_SFU) {<br> sfu_topologies_on_leave(bridge_channel, &bridge->channels);<br>- }<br>-<br>- if (!sc) {<br>- return;<br> }<br> <br> if (bridge->softmix.binaural_active) {<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6268">change 6268</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/6268"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I13026cd90954e0265eab94a0faf635a3e11f0e35 </div>
<div style="display:none"> Gerrit-Change-Number: 6268 </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: Sean Bright <sean.bright@gmail.com> </div>