Swap subs before releasing lock
authorMark Spencer <markster@digium.com>
Tue, 27 Jul 2004 00:53:09 +0000 (00:53 +0000)
committerMark Spencer <markster@digium.com>
Tue, 27 Jul 2004 00:53:09 +0000 (00:53 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3517 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_zap.c

index 0870353..de3f67a 100755 (executable)
@@ -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;