<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/5946">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">channel: Clear channel flag in error branch.<br><br>Clear channel flag AST_FLAG_END_DTMF_ONLY in ast_waitfordigit_full when<br>ast_read returns NULL.<br><br>ASTERISK-27100 #close<br><br>Change-Id: Id3039e9a4e74e0cb359f636c9fd0c9740ebf7d9d<br>---<br>M main/channel.c<br>1 file changed, 5 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/channel.c b/main/channel.c<br>index 4323aed..3e5674a 100644<br>--- a/main/channel.c<br>+++ b/main/channel.c<br>@@ -3557,8 +3557,12 @@<br> } else if (rchan) {<br> int res;<br> struct ast_frame *f = ast_read(c);<br>- if (!f)<br>+<br>+ if (!f) {<br>+ ast_channel_clear_flag(c, AST_FLAG_END_DTMF_ONLY);<br>+<br> return -1;<br>+ }<br> <br> switch (f->frametype) {<br> case AST_FRAME_DTMF_BEGIN:<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/5946">change 5946</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/5946"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 14 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id3039e9a4e74e0cb359f636c9fd0c9740ebf7d9d </div>
<div style="display:none"> Gerrit-Change-Number: 5946 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>