automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10044 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 63b6691fa259909da36ee04e9143a32a2c5cef7e..37d34d395fa722adcc229956fe50ee167547da4e 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1523,6 +1523,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                        lastmarked = currentmarked;
                }
        }
+
+       if (musiconhold)
+               ast_moh_stop(chan);
+       
        if (using_pseudo)
                close(fd);
        else {

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 56b8abf9f9cd9cabeeef70a1e7b70213ad2ead87..c5aff80d05313e149dfe1842649e1fb3b86f65dc 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
@@ -2141,7 +2141,6 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
        if (!peer) {
                if (to) {
                        /* Musta gotten hung up */
-                       record_abandoned(qe);
                        res = -1;
                } else {
                        res = digit;