diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-03-11 18:48:59 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-03-11 18:48:59 +0000 |
| commit | b5003a194308b7b38f4af3ded7786211c20f5b86 (patch) | |
| tree | 63af7bedcd1e48445b7d48cd3cb4526ef8ee15d5 /apps | |
| parent | 7683956e91ad7213577768fcad033b7d2d0830c9 (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: https://origsvn.digium.com/svn/asterisk/trunk@107638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -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; |