|
|
@ -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");
|
|
|
|
ast_log(LOG_WARNING, "Out of memory\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cnfout:
|
|
|
|
cnfout:
|
|
|
|
if (cnf && (make || dynamic))
|
|
|
|
|
|
|
|
cnf->users++;
|
|
|
|
|
|
|
|
ast_mutex_unlock(&conflock);
|
|
|
|
ast_mutex_unlock(&conflock);
|
|
|
|
return cnf;
|
|
|
|
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[CONF_SIZE + AST_FRIENDLY_OFFSET];
|
|
|
|
char *buf = __buf + AST_FRIENDLY_OFFSET;
|
|
|
|
char *buf = __buf + AST_FRIENDLY_OFFSET;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
conf->users++;
|
|
|
|
if (!(confflags & CONFFLAG_QUIET) && conf->users == 1) {
|
|
|
|
if (!(confflags & CONFFLAG_QUIET) && conf->users == 1) {
|
|
|
|
if (!ast_streamfile(chan, "conf-onlyperson", chan->language))
|
|
|
|
if (!ast_streamfile(chan, "conf-onlyperson", chan->language))
|
|
|
|
ast_waitstream(chan, "");
|
|
|
|
ast_waitstream(chan, "");
|
|
|
|