projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9ddc843
)
During hangup it is possible for p->chan or p->owner to be NULL, so just return what...
author
Joshua Colp
<jcolp@digium.com>
Mon, 14 Apr 2008 15:36:02 +0000
(15:36 +0000)
committer
Joshua Colp
<jcolp@digium.com>
Mon, 14 Apr 2008 15:36:02 +0000
(15:36 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114109
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
channels/chan_local.c
patch
|
blob
|
history
diff --git
a/channels/chan_local.c
b/channels/chan_local.c
index
e79c821
..
d371a0f
100644
(file)
--- a/
channels/chan_local.c
+++ b/
channels/chan_local.c
@@
-183,8
+183,11
@@
static struct ast_channel *local_bridgedchannel(struct ast_channel *chan, struct
bridged = (bridge == p->owner ? p->chan : p->owner);
/* Now see if the opposite channel is bridged to anything */
- if (bridged->_bridge)
+ if (!bridged) {
+ bridged = bridge;
+ } else if (bridged->_bridge) {
bridged = bridged->_bridge;
+ }
}
ast_mutex_unlock(&p->lock);