Merged revisions 43003 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43003 | tilghman | 2006-09-15 23:44:02 -0500 (Fri, 15 Sep 2006) | 2 lines

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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43008 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a7ba2cbaef92828b1bc8805f1ecb0f30b41f2915..4fc0206ed5e4f753575fe7e42b69ce0d67db8e67 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1432,6 +1432,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)