[Asterisk-code-review] app_meetme: Don't mute joining admins if conference is muted (...asterisk[16])

[Friendly Automation]

Friendly Automation has submitted this change and it was merged. ( https://gerrit.asterisk.org/c/asterisk/+/11118 )

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

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

ASTERISK-28328 #close

Change-Id: I4f6069fb34923b7521520c2a205a1e56227e592b
---
M apps/app_meetme.c
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Joshua C. Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 6984bd2..cf56c9d 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3430,7 +3430,9 @@
 	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);

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/11118
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: I4f6069fb34923b7521520c2a205a1e56227e592b
Gerrit-Change-Number: 11118
Gerrit-PatchSet: 1
Gerrit-Owner: Sean Bright <sean.bright at gmail.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua C. Colp <jcolp at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190311/3b5cab66/attachment.html>