diff options
| author | Mark Spencer <markster@digium.com> | 2004-12-01 04:35:34 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-12-01 04:35:34 +0000 |
| commit | 34e56e86757e2093df3ffcc523f02b76fe50187e (patch) | |
| tree | ea7d15c677b74c6f8bd9d9da813b0db76832a30d /channels | |
| parent | 4a42b24900142b95c2fc0b52dc4eef28b419bf6a (diff) | |
Make sure we really have a bridged channel (bug #2963)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 6227dd026..0c407424a 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -5174,9 +5174,11 @@ static void *ss_thread(void *data) p->subs[SUB_THREEWAY].owner; struct zt_pvt *pbridge = NULL; /* set up the private struct of the bridged one, if any */ - if (nbridge && ast_bridged_channel(nbridge)) pbridge = ast_bridged_channel(nbridge)->pvt->pvt; - if (nbridge && - (!strcmp(nbridge->type,"Zap")) && + if (nbridge && ast_bridged_channel(nbridge)) + pbridge = ast_bridged_channel(nbridge)->pvt->pvt; + if (nbridge && pbridge && + (!strcmp(nbridge->type,"Zap")) && + (!strcmp(ast_bridged_channel(nbridge)->type, "Zap")) && ISTRUNK(pbridge)) { int func = ZT_FLASH; /* Clear out the dial buffer */ |