diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 04:44:02 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 04:44:02 +0000 |
| commit | 60201da27b7708c921e166dee9734a67e4bdd52a (patch) | |
| tree | 96b0bc2e8b4604b3dfd14d8ed2101abba6f814f6 | |
| parent | bbf41a35c6bdf0db8944d4c59ecd2ad0f5166b0a (diff) | |
When the marked user enters the conference, we should no longer timeout
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@43003 f38db490-d61c-443f-a65b-d21fe96a405b
| -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) |