automerge commit

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a4d82eb384dea4f00a22b0f9d9707f9939ee8d48..69996c8f703859a9562923e54930a28da9625b20 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1069,7 +1069,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
        if (!firstpass && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) {
                firstpass = 1;
                if (!(confflags & CONFFLAG_QUIET))
-                       if (!(confflags & CONFFLAG_WAITMARKED) || (conf->markedusers >= 1))
+                       if (!(confflags & CONFFLAG_WAITMARKED) || ((confflags & CONFFLAG_MARKEDUSER) && (conf->markedusers >= 1)))
                                conf_play(chan, conf, ENTER);
        }