From 97b2fa8de18777eb31f20e86dd1c31ffa3a0f17b Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Wed, 4 Apr 2012 13:51:45 +0000 Subject: Make the MeetMeAdmin N command (mute all nonadmins) not mute admins (Closes Issue ASTERISK-19335) Reported by: Johan Wilfer Review: https://reviewboard.asterisk.org/r/1843/ ........ Merged revisions 361090 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 361091 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@361092 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 8c4dc3d73..46a42a5d3 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4716,7 +4716,7 @@ static int admin_exec(struct ast_channel *chan, const char *data) { user->adminflags |= ADMINFLAG_MUTED; break; case 78: /* N: Mute all (non-admin) users */ - ao2_callback(cnf->usercontainer, OBJ_NODATA, user_set_muted_cb, NULL); + ao2_callback(cnf->usercontainer, OBJ_NODATA, user_set_muted_cb, &cnf); break; case 109: /* m: Unmute */ user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED | ADMINFLAG_T_REQUEST); -- cgit v1.2.3