kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-14 21:05:23 +00:00
parent 3a0ec4568d
commit 86a106023b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_meetme.c
View File

@@ -1523,6 +1523,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
lastmarked = currentmarked; lastmarked = currentmarked;
} }
} }
if (musiconhold)
ast_moh_stop(chan);
if (using_pseudo) if (using_pseudo)
close(fd); close(fd);
else { else {

3
apps/app_queue.c
View File

@@ -1,7 +1,7 @@
/* /*
* Asterisk -- An open source telephony toolkit. * Asterisk -- An open source telephony toolkit.
* *
* Copyright (C) 1999 - 2005, Digium, Inc. * Copyright (C) 1999 - 2006, Digium, Inc.
* *
* Mark Spencer <markster@digium.com> * 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 (!peer) {
if (to) { if (to) {
/* Musta gotten hung up */ /* Musta gotten hung up */
record_abandoned(qe);
res = -1; res = -1;
} else { } else {
res = digit; res = digit;