diff options
author | Mark Spencer <markster@digium.com> | 2005-03-21 03:23:05 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2005-03-21 03:23:05 +0000 |
commit | 00ffb24b83d41ebbf7856982af08482c26bec8b9 (patch) | |
tree | cb46a958a1a05670e262290d09f6c81b9831f48a /apps | |
parent | b0fa3b6450dc1177f73abf6496dc6366f7fa2573 (diff) |
Revert broken portion of 3815 (bug #3816)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0d9d00ed8..eb905af6b 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); |