kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_meetme: Don't mute joining admins if conference is muted" into 16

Browse Source
This commit is contained in:
Friendly Automation
2019-03-11 09:14:48 -05:00
committed by Gerrit Code Review
parent 4ca41caf38 5b5aa05bd9
commit 13cca7bb11
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

@@ -3430,7 +3430,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
user->chan = chan; user->chan = chan;
user->userflags = *confflags; user->userflags = *confflags;
user->adminflags = ast_test_flag64(confflags, CONFFLAG_STARTMUTED) ? ADMINFLAG_SELFMUTED : 0; user->adminflags = ast_test_flag64(confflags, CONFFLAG_STARTMUTED) ? ADMINFLAG_SELFMUTED : 0;
user->adminflags |= (conf->gmuted) ? ADMINFLAG_MUTED : 0; if (!ast_test_flag64(confflags, CONFFLAG_ADMIN)) {
user->adminflags |= (conf->gmuted) ? ADMINFLAG_MUTED : 0;
}
user->talking = -1; user->talking = -1;
ast_mutex_unlock(&conf->playlock); ast_mutex_unlock(&conf->playlock);