[Asterisk-cvs] asterisk/apps app_meetme.c,1.43,1.44

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv5353/apps

Modified Files:
	app_meetme.c 
Log Message:
More meetme locking fixes


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- app_meetme.c	17 Jun 2004 04:42:03 -0000	1.43
+++ app_meetme.c	17 Jun 2004 05:21:54 -0000	1.44
@@ -513,7 +513,7 @@
 		}
 	}
       
-      	ast_mutex_lock(&conflock);
+   	ast_mutex_lock(&conflock);
 	if (conf->firstuser == NULL) {
 		/* Fill the first new User struct */
 		user->user_no = 1;
@@ -906,13 +906,14 @@
 		conf_play(conf, LEAVE);
 
 outrun:
+	ast_mutex_lock(&conflock);
 	if (user->user_no) { /* Only cleanup users who really joined! */
 		manager_event(EVENT_FLAG_CALL, "MeetmeLeave", 
 			"Channel: %s\r\n"
 			"Uniqueid: %s\r\n"
 			"Meetme: %s\r\n",
 			chan->name, chan->uniqueid, conf->confno);
-		ast_mutex_lock(&conflock);
+		prev = NULL;
 		conf->users--;
 		cur = confs;
 		if (!conf->users) {