kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-13 13:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(closes issue #10122)

Browse Source 
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/branches/1.4@81776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-09-06 19:40:37 +00:00
parent 8e10babcbd
commit e73fa2ba6f
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_meetme.c
View File

@@ -1780,13 +1780,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (musiconhold == 0 && (confflags & CONFFLAG_MOH)) { if (musiconhold == 0 && (confflags & CONFFLAG_MOH)) {
ast_moh_start(chan, NULL, NULL); ast_moh_start(chan, NULL, NULL);
musiconhold = 1; 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) { } else if(currentmarked >= 1 && lastmarked == 0) {
/* Marked user entered, so cancel timeout */ /* Marked user entered, so cancel timeout */