[asterisk-commits] tilghman: branch 1.2 r43003 - /branches/1.2/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Fri Sep 15 23:44:02 2006
New Revision: 43003

URL: http://svn.digium.com/view/asterisk?rev=43003&view=rev
Log:
When the marked user enters the conference, we should no longer timeout

Modified:
    branches/1.2/apps/app_meetme.c

Modified: branches/1.2/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/apps/app_meetme.c?rev=43003&r1=43002&r2=43003&view=diff
==============================================================================
--- branches/1.2/apps/app_meetme.c (original)
+++ branches/1.2/apps/app_meetme.c Fri Sep 15 23:44:02 2006
@@ -1198,6 +1198,8 @@
 						}
 					}
 				} 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)