aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-06 19:40:37 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-06 19:40:37 +0000
commit2107b6c595df86d315687295c66eba5f344083c6 (patch)
tree595e80b421a6e4e37f3788821321bca977917674 /apps
parent54ae514f492e094c340a897929d14aff929b8a19 (diff)
(closes issue #10122)
Reported by: stevefeinstein Patches: meetme-unmute-manager.diff uploaded by qwell (license 4) Tested by: stevefeinstein After looking over the code I agree with Qwell. Setting the file descriptor to conference each time just causes a fight back and forth. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@81776 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index ea5b5eea2..f1a7bcdec 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1780,13 +1780,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (musiconhold == 0 && (confflags & CONFFLAG_MOH)) {
ast_moh_start(chan, NULL, NULL);
musiconhold = 1;
- } else {
- ztc.confmode = ZT_CONF_CONF;
- if (ioctl(fd, ZT_SETCONF, &ztc)) {
- ast_log(LOG_WARNING, "Error setting conference\n");
- close(fd);
- goto outrun;
- }
}
} else if(currentmarked >= 1 && lastmarked == 0) {
/* Marked user entered, so cancel timeout */