Revert broken portion of 3815 (bug #3816)

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 0d9d00e..eb905af 100755 (executable)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -964,7 +964,7 @@ zapretry:
                        }
 
                        /* trying to add moh for single person conf */
-                       if (confflags & CONFFLAG_MOH)  {
+                       if ((confflags & CONFFLAG_MOH) && !(confflags & CONFFLAG_WAITMARKED)) {
                                if (conf->users == 1) {
                                        if (musiconhold == 0) {
                                                ast_moh_start(chan, NULL);