Merged revisions 107637 via svnmerge from
[asterisk/asterisk.git] / apps / app_meetme.c
index 95f1e44..f89e51a 100644 (file)
@@ -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;