Make a minor tweak to admin_exec() - don't lock the conference list until it
authorRussell Bryant <russell@russellbryant.com>
Mon, 7 May 2007 22:17:40 +0000 (22:17 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 7 May 2007 22:17:40 +0000 (22:17 +0000)
is actually necessary.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63326 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 01cf838..0e50414 100644 (file)
@@ -2768,17 +2768,16 @@ static int admin_exec(struct ast_channel *chan, void *data) {
 
        u = ast_module_user_add(chan);
 
-       AST_LIST_LOCK(&confs);
-       
        params = ast_strdupa(data);
        AST_STANDARD_APP_ARGS(args, params);
 
        if (!args.command) {
                ast_log(LOG_WARNING, "MeetmeAdmin requires a command!\n");
-               AST_LIST_UNLOCK(&confs);
                ast_module_user_remove(u);
                return -1;
        }
+
+       AST_LIST_LOCK(&confs);
        AST_LIST_TRAVERSE(&confs, cnf, list) {
                if (!strcmp(cnf->confno, args.confno))
                        break;
@@ -2953,7 +2952,7 @@ static int channel_admin_exec(struct ast_channel *chan, void *data) {
        }
        
        /* perform the specified action */
-       switch(*args.command) {
+       switch (*args.command) {
                case 77: /* M: Mute */ 
                        user->adminflags |= ADMINFLAG_MUTED;
                        break;