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 d8493d0426a4c30b9edb75dd9bb074c6a10218b2..28f157624e71deec2ab0b43dc4bd69b5ed9f8e33 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3433,7 +3433,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);