diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 18:48:59 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 18:48:59 +0000 |
| commit | 82da51173aa388f408a3e25a24cec1eec36e6cf3 (patch) | |
| tree | 63af7bedcd1e48445b7d48cd3cb4526ef8ee15d5 /apps/app_meetme.c | |
| parent | a74d39d534c523b7a9bd5d8e65d5a325a7dba139 (diff) | |
Merged revisions 107637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r107637 | file | 2008-03-11 15:47:33 -0300 (Tue, 11 Mar 2008) | 4 lines
Add an additional check for setting conference parameter when using the marked user options. It was possible for it to return to a no listen/no talk state if a masquerade happened.
(closes issue #12136)
Reported by: aragon
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@107638 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | 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 95f1e4444..f89e51ab0 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1876,7 +1876,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } - if (confflags & CONFFLAG_WAITMARKED) + if (confflags & CONFFLAG_WAITMARKED && !conf->markedusers) ztc.confmode = ZT_CONF_CONF; else if (confflags & CONFFLAG_MONITOR) ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER; |