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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@43003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · b2122691de
parent 1df9da9fef
commit b2122691de
1 changed files with 2 additions and 0 deletions
--- 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)