projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
168242c
)
Fix dynamic user count, Take 4
author
Jeremy McNamara
<jj@nufone.net>
Sun, 11 Jan 2004 08:07:23 +0000
(08:07 +0000)
committer
Jeremy McNamara
<jj@nufone.net>
Sun, 11 Jan 2004 08:07:23 +0000
(08:07 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1936
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
apps/app_meetme.c
patch
|
blob
|
history
diff --git
a/apps/app_meetme.c
b/apps/app_meetme.c
index
5975e33
..
21f3fb9
100755
(executable)
--- a/
apps/app_meetme.c
+++ b/
apps/app_meetme.c
@@
-191,8
+191,6
@@
static struct ast_conference *build_conf(char *confno, char *pin, int make, int
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
@@
static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
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, "");