mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-20 11:43:52 +00:00
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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@425669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -4953,18 +4953,20 @@ static int unistim_hangup(struct ast_channel *ast)
|
|||||||
} else if (sub->subtype == SUB_RING) {
|
} else if (sub->subtype == SUB_RING) {
|
||||||
send_no_ring(s);
|
send_no_ring(s);
|
||||||
for (i = 0; i < FAVNUM; i++) {
|
for (i = 0; i < FAVNUM; i++) {
|
||||||
if (!soft_key_visible(s->device, i))
|
if (!soft_key_visible(s->device, i)) {
|
||||||
continue;
|
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;
|
continue;
|
||||||
|
}
|
||||||
if (is_key_line(d, i) && !strcmp(l->name, d->sline[i]->name)) {
|
if (is_key_line(d, i) && !strcmp(l->name, d->sline[i]->name)) {
|
||||||
send_favorite_short(i, FAV_LINE_ICON, s);
|
send_favorite_short(i, FAV_LINE_ICON, s);
|
||||||
d->ssub[i] = NULL;
|
d->ssub[i] = NULL;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (d->ssub[i] != NULL) { /* Found other subchannel active other then hangup'ed one */
|
|
||||||
end_call = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (end_call) {
|
if (end_call) {
|
||||||
|
Reference in New Issue
Block a user