From: Mark Spencer <markster@digium.com>
Date: Thu, 17 Jun 2004 05:21:54 +0000 (+0000)
Subject: More meetme locking fixes
X-Git-Tag: 1.0.0-rc1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d11177774a434fb1d423b3f21a4c8bb16906b768;p=thirdparty%2Fasterisk.git

More meetme locking fixes


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 9b513661ad..b48e99f220 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -513,7 +513,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 		}
 	}
       
-      	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 @@ zapretry:
 		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) {