[Asterisk-cvs] asterisk/channels chan_zap.c,1.308,1.309

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/tmp/cvs-serv7978/channels

Modified Files:
	chan_zap.c 
Log Message:
Swap subs before releasing lock


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- chan_zap.c	26 Jul 2004 13:38:47 -0000	1.308
+++ chan_zap.c	27 Jul 2004 00:53:09 -0000	1.309
@@ -2882,8 +2882,9 @@
 					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;