dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 43003 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43003 | tilghman | 2006-09-15 23:44:02 -0500 (Fri, 15 Sep 2006) | 2 lines

When the marked user enters the conference, we should no longer timeout

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43008 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2006-09-16 05:43:54 +00:00
parent fe9ed45b05
commit 4ba23c8dc4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_meetme.c
View File

@ -1432,6 +1432,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
}
}
} else if(currentmarked >= 1 && lastmarked == 0) {
/* Marked user entered, so cancel timeout */
timeout = 0;
if (confflags & CONFFLAG_MONITOR)
ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER;
else if (confflags & CONFFLAG_TALKER)