From: Sean Bright <sean.bright@gmail.com>
Date: Thu, 7 Mar 2019 23:15:05 +0000 (-0500)
Subject: app_meetme: Don't mute joining admins if conference is muted
X-Git-Tag: 16.3.0-rc1~27^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b5aa05bd90e94b4163c24352237e4ef6d5e0bc9;p=thirdparty%2Fasterisk.git

app_meetme: Don't mute joining admins if conference is muted

ASTERISK-28328 #close

Change-Id: I4f6069fb34923b7521520c2a205a1e56227e592b
---

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);