Cleanup side effect sof meetme changes (bug #3815)
authorMark Spencer <markster@digium.com>
Mon, 21 Mar 2005 02:06:58 +0000 (02:06 +0000)
committerMark Spencer <markster@digium.com>
Mon, 21 Mar 2005 02:06:58 +0000 (02:06 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5219 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c
sounds/conf-onlyone.gsm [new file with mode: 0755]
sounds/conf-otherinparty.gsm [new file with mode: 0755]
sounds/conf-thereare.gsm [new file with mode: 0755]

index 90e9940..0d9d00e 100755 (executable)
@@ -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 (executable)
index 0000000..3584f00
Binary files /dev/null and b/sounds/conf-onlyone.gsm differ
diff --git a/sounds/conf-otherinparty.gsm b/sounds/conf-otherinparty.gsm
new file mode 100755 (executable)
index 0000000..811263d
Binary files /dev/null and b/sounds/conf-otherinparty.gsm differ
diff --git a/sounds/conf-thereare.gsm b/sounds/conf-thereare.gsm
new file mode 100755 (executable)
index 0000000..c810b17
Binary files /dev/null and b/sounds/conf-thereare.gsm differ