Add an additional check for setting conference parameter when using the marked user...

(closes issue #12136)
Reported by: aragon

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@107637 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index e079898ea66af80fed20b67e0b1e6ba4fc364084..9dbdea821fe2c5d70f0429608b8b5e031632a334 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1658,7 +1658,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;