From: Joshua Colp <jcolp@digium.com>
Date: Tue, 30 May 2006 17:33:37 +0000 (+0000)
Subject: Remove ourselves from the userlist a little bit earlier
X-Git-Tag: 1.4.0-beta1~1155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f35b95e516398ad7ecdf687a0fca6da915539ad9;p=thirdparty%2Fasterisk.git

Remove ourselves from the userlist a little bit earlier


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index e8a664a537..6c6b2d3f47 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -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));