kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 168705 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-01-15 15:34:35 +00:00
parent b40ebef036
commit bd1a0134d6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_meetme.c
View File

@@ -1809,10 +1809,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;
}