diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 16:02:27 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 16:02:27 +0000 |
| commit | a78d846e50e23553ce04c0126e01598d749c952d (patch) | |
| tree | a2a2275ccd184309f61cf1509b950b0d1a191472 | |
| parent | 148f4e5a0866b9edbc060d3fd6f3ad94fdd61f1a (diff) | |
Merged revisions 288747 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r288747 | twilson | 2010-09-24 08:37:39 -0700 (Fri, 24 Sep 2010) | 12 lines
Merged revisions 288746 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r288746 | twilson | 2010-09-24 08:26:09 -0700 (Fri, 24 Sep 2010) | 5 lines
Don't fail a masquerade if it is already being hung up
This avoids noise on some Local channel situations where we don't use /n.
Thanks to Alec Davis for the suggestion.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288748 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_local.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 343e41f90..6cee48f9e 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -570,7 +570,7 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) p->chan = newchan; /* Do not let a masquerade cause a Local channel to be bridged to itself! */ - if (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner) { + if (!ast_check_hangup(newchan) && (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner)) { ast_log(LOG_WARNING, "You can not bridge a Local channel to itself!\n"); ast_mutex_unlock(&p->lock); ast_queue_hangup(newchan); |