[Asterisk-cvs] asterisk/apps app_meetme.c,1.12,1.13

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv29894

Modified Files:
	app_meetme.c 
Log Message:
Fix dynamic user count, Take 4


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_meetme.c	11 Jan 2004 06:54:22 -0000	1.12
+++ app_meetme.c	11 Jan 2004 08:07:23 -0000	1.13
@@ -191,8 +191,6 @@
 			ast_log(LOG_WARNING, "Out of memory\n");
 	}
 cnfout:
-	if (cnf && (make || dynamic)) 
-		cnf->users++;
 	ast_mutex_unlock(&conflock);
 	return cnf;
 }
@@ -266,6 +264,7 @@
 	char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
 	char *buf = __buf + AST_FRIENDLY_OFFSET;
 	
+	conf->users++;
 	if (!(confflags & CONFFLAG_QUIET) && conf->users == 1) {
 		if (!ast_streamfile(chan, "conf-onlyperson", chan->language))
 			ast_waitstream(chan, "");