mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-17 15:29:05 +00:00
Merged revisions 331772 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r331772 | rmudgett | 2011-08-12 13:59:45 -0500 (Fri, 12 Aug 2011) | 15 lines Merged revisions 331771 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r331771 | rmudgett | 2011-08-12 13:58:40 -0500 (Fri, 12 Aug 2011) | 8 lines Suppress warning message when using DAHDITransfer or DAHDIHangup. * The fake event should only be processed by the channel that currently owns the private and not the associated call waiting or 3-way channel. JIRA AST-620 JIRA SWP-3616 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -9010,8 +9010,11 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast)
|
||||
return &p->subs[idx].f;
|
||||
}
|
||||
|
||||
/* If we have a fake_event, fake an exception to handle it */
|
||||
if (p->fake_event) {
|
||||
/*
|
||||
* If we have a fake_event, fake an exception to handle it only
|
||||
* if this channel owns the private.
|
||||
*/
|
||||
if (p->fake_event && p->owner == ast) {
|
||||
if (analog_lib_handles(p->sig, p->radio, p->oprmode)) {
|
||||
struct analog_pvt *analog_p = p->sig_pvt;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user