diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-27 00:53:09 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-27 00:53:09 +0000 |
| commit | bda993585601c56ff938e944c3f9fdcbbdb3f2fd (patch) | |
| tree | 1e3125df878950914335527b7d545f29815fa08f /channels/chan_zap.c | |
| parent | 5e82ef61af039a657650e10236d6f31d93da5afe (diff) | |
Swap subs before releasing lock
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3517 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rwxr-xr-x | channels/chan_zap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 087035329..de3f67a74 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2882,8 +2882,9 @@ static int attempt_transfer(struct zt_pvt *p) p->subs[SUB_THREEWAY].owner->bridge->name, p->subs[SUB_REAL].owner->name); return -1; } - ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); + /* Three-way is now the REAL */ swap_subs(p, SUB_THREEWAY, SUB_REAL); + ast_mutex_unlock(&p->subs[SUB_REAL].owner->lock); unalloc_sub(p, SUB_THREEWAY); /* Tell the caller not to hangup */ return 1; |