mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
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:
@@ -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
BIN
sounds/conf-onlyone.gsm
Executable file
Binary file not shown.
BIN
sounds/conf-otherinparty.gsm
Executable file
BIN
sounds/conf-otherinparty.gsm
Executable file
Binary file not shown.
BIN
sounds/conf-thereare.gsm
Executable file
BIN
sounds/conf-thereare.gsm
Executable file
Binary file not shown.
Reference in New Issue
Block a user