From: Automerge script <automerge@asterisk.org>
Date: Sat, 16 Sep 2006 05:00:50 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.13-netsec~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d4e8df3d651d778721585a78f38c079329ca49f;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 1c81aae46a..891fc36552 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)