From 8085c618c0edd754522e9c243cbaab8411592af3 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Mon, 21 Mar 2005 02:06:58 +0000 Subject: [PATCH] Cleanup side effect sof meetme changes (bug #3815) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5219 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 4 ++-- sounds/conf-onlyone.gsm | Bin 0 -> 5511 bytes sounds/conf-otherinparty.gsm | Bin 0 -> 3432 bytes sounds/conf-thereare.gsm | Bin 0 -> 1947 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100755 sounds/conf-onlyone.gsm create mode 100755 sounds/conf-otherinparty.gsm create mode 100755 sounds/conf-thereare.gsm diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 90e994089d..0d9d00ed8e 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; } diff --git a/sounds/conf-onlyone.gsm b/sounds/conf-onlyone.gsm new file mode 100755 index 0000000000000000000000000000000000000000..3584f00f9b61d5842d49b5f680b9b82f3a095429 GIT binary patch literal 5511 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 literal 0 HcmV?d00001