diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-21 02:06:58 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-21 02:06:58 +0000 |
| commit | c993788dfe4f5dbe680a0fea2ad59ee96d28128e (patch) | |
| tree | cbb86d06ebec0e0a149e4123a5c15bd928cf5e64 /apps | |
| parent | c78703a83b635fbb971c49eaf5350213b1cf6c80 (diff) | |
Cleanup side effect sof meetme changes (bug #3815)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5219 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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; } |