diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-17 05:21:54 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-17 05:21:54 +0000 |
| commit | f66298ca84c818ac625d481f0f0c49ca4b949dae (patch) | |
| tree | d32b60bc99ddd9ee1165770d340b47ec52593b91 /apps | |
| parent | ad54a1ab033c88369a74b3403e0a5b7e65402abd (diff) | |
More meetme locking fixes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3236 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/app_meetme.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 9b513661a..b48e99f22 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) { |