From: Mark Spencer <markster@digium.com>
Date: Mon, 21 Mar 2005 03:23:05 +0000 (+0000)
Subject: Revert broken portion of 3815 (bug #3816)
X-Git-Tag: 1.2.0-beta1~1046
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00ffb24b83d41ebbf7856982af08482c26bec8b9;p=thirdparty%2Fasterisk.git

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 0d9d00ed8e..eb905af6b1 100755
--- 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);