[Asterisk-cvs] asterisk/apps app_meetme.c,1.60.2.1,1.60.2.2

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	app_meetme.c 
Log Message:
fix MEETMESECS (bug 2936)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.2
diff -u -d -r1.60.2.1 -r1.60.2.2
--- app_meetme.c	23 Oct 2004 12:42:16 -0000	1.60.2.1
+++ app_meetme.c	25 Nov 2004 18:27:22 -0000	1.60.2.2
@@ -524,7 +524,9 @@
 	memset(user, 0, sizeof(struct ast_conf_user));
 
 	user->user_no = 0; /* User number 0 means starting up user! (dead - not in the list!) */
-	
+
+	time(&user->jointime);
+
 	if (conf->locked) {
 		/* Sorry, but this confernce is locked! */	
 		if (!ast_streamfile(chan, "conf-locked", chan->language))
@@ -557,7 +559,6 @@
 			conf->lastuser = user;
 		}
 	}
-	strncpy(user->usrvalue, "test", sizeof(user->usrvalue) - 1);
 	user->chan = chan;
 	user->userflags = confflags;
 	user->adminflags = 0;
@@ -1043,10 +1044,10 @@
 				else
 					ast_log(LOG_ERROR, "Bad! Bad! Bad! user->prevuser is NULL but we're not the beginning!\n");
 			}
-			/* Return the number of seconds the user was in the conf */
-			snprintf(meetmesecs, sizeof(meetmesecs), "%i", (int) (user->jointime - time(NULL)));
-			pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
 		}
+		/* Return the number of seconds the user was in the conf */
+		snprintf(meetmesecs, sizeof(meetmesecs), "%i", (int) (time(NULL) - user->jointime));
+		pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
 	}
 	free(user);
 	ast_mutex_unlock(&conflock);