diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 05:43:54 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 05:43:54 +0000 |
| commit | 4ba23c8dc4fb587725f3bfd7e0a24e43e028684a (patch) | |
| tree | f0a90331ba8e579835c1ab330826abe347e43226 /apps/app_meetme.c | |
| parent | fe9ed45b0562df0437454ec3ddd2132ba9fc4c07 (diff) | |
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
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a7ba2cbae..4fc0206ed 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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) |