diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-11 00:45:02 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-11 00:45:02 +0000 |
| commit | 48666af149b41ce605c40c044a522d258d6c5b04 (patch) | |
| tree | 7fae1ebe300d026ae0650f50d57189c5a7402c8f /apps | |
| parent | 595e6dc818ff72c8e52e0b55a381782165031750 (diff) | |
issue #5680
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7064 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 9b4c618be..3bdb789d3 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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, ""); |