diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-21 03:23:05 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-21 03:23:05 +0000 |
| commit | 1d3c21e144ed7a5f1979c8069548c8bea3f6094a (patch) | |
| tree | cb46a958a1a05670e262290d09f6c81b9831f48a /apps | |
| parent | 2a0305c8ca98811a26735432f5ed8a58bb93d392 (diff) | |
Revert broken portion of 3815 (bug #3816)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5221 f38db490-d61c-443f-a65b-d21fe96a405b
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); |