mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-18 15:49:56 +00:00
issue #5680
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -848,7 +848,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
||||
|
||||
time(&user->jointime);
|
||||
|
||||
if (conf->locked) {
|
||||
if (conf->locked && (!(confflags & CONFFLAG_ADMIN))) {
|
||||
/* Sorry, but this confernce is locked! */
|
||||
if (!ast_streamfile(chan, "conf-locked", chan->language))
|
||||
ast_waitstream(chan, "");
|
||||
|
||||
Reference in New Issue
Block a user