Cleanup side effect sof meetme changes (bug #3815)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-21 02:06:58 +00:00
parent c6822b3fb1
commit 8085c618c0
4 changed files with 2 additions and 2 deletions

View File

@@ -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;
}

BIN
sounds/conf-onlyone.gsm Executable file

Binary file not shown.

BIN
sounds/conf-otherinparty.gsm Executable file

Binary file not shown.

BIN
sounds/conf-thereare.gsm Executable file

Binary file not shown.