mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 11:42:27 +00:00
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
This commit is contained in:
@@ -1198,6 +1198,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if(currentmarked >= 1 && lastmarked == 0) {
|
} else if(currentmarked >= 1 && lastmarked == 0) {
|
||||||
|
/* Marked user entered, so cancel timeout */
|
||||||
|
timeout = 0;
|
||||||
if (confflags & CONFFLAG_MONITOR)
|
if (confflags & CONFFLAG_MONITOR)
|
||||||
ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER;
|
ztc.confmode = ZT_CONF_CONFMON | ZT_CONF_LISTENER;
|
||||||
else if (confflags & CONFFLAG_TALKER)
|
else if (confflags & CONFFLAG_TALKER)
|
||||||
|
Reference in New Issue
Block a user