diff options
| author | Mark Spencer <markster@digium.com> | 2005-03-21 02:06:58 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-03-21 02:06:58 +0000 |
| commit | 8085c618c0edd754522e9c243cbaab8411592af3 (patch) | |
| tree | cbb86d06ebec0e0a149e4123a5c15bd928cf5e64 /apps/app_meetme.c | |
| parent | c6822b3fb18a7e61d3508c7b003dd8a52123ae40 (diff) | |
Cleanup side effect sof meetme changes (bug #3815)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rwxr-xr-x | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 90e994089..0d9d00ed8 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) && !( confflags & CONFFLAG_WAITMARKED)) { + if (confflags & CONFFLAG_MOH) { if (conf->users == 1) { if (musiconhold == 0) { ast_moh_start(chan, NULL); @@ -979,7 +979,7 @@ zapretry: } /* Leave if the last marked user left */ - if (currentmarked == 0 && (confflags & CONFFLAG_MARKEDEXIT)) { + if (currentmarked == 0 && lastmarked != 0 && (confflags & CONFFLAG_MARKEDEXIT)) { ret = -1; break; } |