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 1c81aae46a10019b0edcc0a9be4885b33f87fa1f..891fc3655274d317de914b04c73b10599685c04d 100644 (file)
--- 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)