From 5b5aa05bd90e94b4163c24352237e4ef6d5e0bc9 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Thu, 7 Mar 2019 18:15:05 -0500 Subject: [PATCH] app_meetme: Don't mute joining admins if conference is muted ASTERISK-28328 #close Change-Id: I4f6069fb34923b7521520c2a205a1e56227e592b --- apps/app_meetme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 6984bd2eb6..cf56c9d308 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3430,7 +3430,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc user->chan = chan; user->userflags = *confflags; 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; ast_mutex_unlock(&conf->playlock);