mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
fix moh option in conjunction with intro option (bug #4298)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -640,7 +640,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
||||
ast_waitstream(chan, "");
|
||||
goto outrun;
|
||||
}
|
||||
conf->users++;
|
||||
|
||||
if (confflags & CONFFLAG_MARKEDUSER)
|
||||
conf->markedusers++;
|
||||
@@ -687,6 +686,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
||||
ast_record_review(chan,"vm-rec-name",user->namerecloc, 10,"sln", &duration, NULL);
|
||||
}
|
||||
|
||||
conf->users++;
|
||||
|
||||
if (!(confflags & CONFFLAG_QUIET)) {
|
||||
if (conf->users == 1 && !(confflags & CONFFLAG_WAITMARKED))
|
||||
if (!ast_streamfile(chan, "conf-onlyperson", chan->language))
|
||||
|
Reference in New Issue
Block a user