diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-15 15:37:48 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-15 15:37:48 +0000 |
| commit | 42dfb699d7e01e4848a51d9856730062ae09225a (patch) | |
| tree | 94e6e3c7c115a3c2fc1ee096cde124640f92782d /apps/app_meetme.c | |
| parent | fd541b3fa608897dff023373249f12eb189b7706 (diff) | |
Merged revisions 168705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r168705 | seanbright | 2009-01-15 10:33:18 -0500 (Thu, 15 Jan 2009) | 11 lines
Add a missing unlock and properly handle the 'maxusers' setting on MeetMe
conferences. We were using the 'user number' field to compare against the
maximum allowed users, which works assuming users with lower user numbers
didn't leave the conference.
(closes issue #14117)
Reported by: sergedevorop
Patches:
20090114__bug14117-2.diff.txt uploaded by seanbright (license 71)
Tested by: sergedevorop
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168707 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index c6902ffa0..0cdace76b 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1853,10 +1853,12 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c user->user_no = AST_LIST_LAST(&conf->userlist)->user_no + 1; if (rt_schedule && conf->maxusers) - if (user->user_no > conf->maxusers) { + if (conf->users >= conf->maxusers) { /* Sorry, but this confernce has reached the participant limit! */ if (!ast_streamfile(chan, "conf-full", chan->language)) ast_waitstream(chan, ""); + ast_mutex_unlock(&conf->playlock); + user->user_no = 0; goto outrun; } |