diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 05:00:50 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 05:00:50 +0000 |
| commit | 337c5ead9e800e349b405a7ec3b4916ed0eb4275 (patch) | |
| tree | 4ed05639ccac828d73f512c64d6cc57acf6417fb /apps/app_meetme.c | |
| parent | e98edc3d3171c9b27f4734820fa5b9722eb94c6a (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43007 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 1c81aae46..891fc3655 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1198,6 +1198,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) |