Author: igorg Date: Thu Oct 16 01:22:07 2014 New Revision: 425677 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425677 Log:
Fix loss of voice after second call drops (on a second line) in case using multiple lines on unistim phones. There is regression was introduced in r391379. Reported by: Rustam Khankishyiev (closes issue ASTERISK-23846) ........ Merged revisions 425667 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 425668 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 425669 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/channels/chan_unistim.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/channels/chan_unistim.c URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_unistim.c?view=diff&rev=425677&r1=425676&r2=425677 ============================================================================== --- trunk/channels/chan_unistim.c (original) +++ trunk/channels/chan_unistim.c Thu Oct 16 01:22:07 2014 @@ -4953,17 +4953,19 @@ } else if (sub->subtype == SUB_RING) { send_no_ring(s); for (i = 0; i < FAVNUM; i++) { - if (!soft_key_visible(s->device, i)) + if (!soft_key_visible(s->device, i)) { continue; - if (d->ssub[i] != sub) + } + if (d->ssub[i] != sub) { + if (d->ssub[i] != NULL) { /* Found other subchannel active other then hangup'ed one */ + end_call = 0; + } continue; + } if (is_key_line(d, i) && !strcmp(l->name, d->sline[i]->name)) { send_favorite_short(i, FAV_LINE_ICON, s); d->ssub[i] = NULL; continue; - } - if (d->ssub[i] != NULL) { /* Found other subchannel active other then hangup'ed one */ - end_call = 0; } } } -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
