From 8c8979936d56509c7aeeebd5a25f11b5c79e6e7a Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 6 Sep 2007 19:43:20 +0000 Subject: [PATCH] Merged revisions 81776 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81776 | file | 2007-09-06 16:40:37 -0300 (Thu, 06 Sep 2007) | 7 lines (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: https://origsvn.digium.com/svn/asterisk/trunk@81777 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index e3ed72226c..99217a240b 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1819,13 +1819,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 */