[asterisk-commits] trunk r30835 - /trunk/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue May 30 12:33:37 2006
New Revision: 30835

URL: http://svn.digium.com/view/asterisk?rev=30835&view=rev
Log:
Remove ourselves from the userlist a little bit earlier

Modified:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=30835&r1=30834&r2=30835&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Tue May 30 12:33:37 2006
@@ -1730,12 +1730,12 @@
 		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));