Remove ourselves from the userlist a little bit earlier
authorJoshua Colp <jcolp@digium.com>
Tue, 30 May 2006 17:33:37 +0000 (17:33 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 30 May 2006 17:33:37 +0000 (17:33 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30835 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index e8a664a..6c6b2d3 100644 (file)
@@ -1730,12 +1730,12 @@ bailoutandtrynormal:
                ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL);
                if (confflags & CONFFLAG_MARKEDUSER) 
                        conf->markedusers--;
+               /* Remove ourselves from the list */
+               AST_LIST_REMOVE(&conf->userlist, user, list);
                if (AST_LIST_EMPTY(&conf->userlist)) {
                        /* close this one when no more users and no references*/
                        if (!conf->refcount)
                                conf_free(conf);
-               } else {
-                       AST_LIST_REMOVE(&conf->userlist, user, list);
                }
                /* Return the number of seconds the user was in the conf */
                snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));