From 71ca1d1630446bb6290ff58dbbcce3a6cbebb80e Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Sun, 11 Aug 2002 02:12:40 +0000 Subject: Version 0.2.0 from FTP git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@504 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 7a0ad67cf..cec00c339 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -337,6 +337,16 @@ zapretry: } if (fd != chan->fds[0]) close(fd); + else { + /* Take out of conference */ + /* Add us to the conference */ + ztc.chan = 0; + ztc.confno = 0; + ztc.confmode = 0; + if (ioctl(fd, ZT_SETCONF, &ztc)) { + ast_log(LOG_WARNING, "Error setting conference\n"); + } + } conf_play(conf, LEAVE); @@ -410,7 +420,7 @@ static int count_exec(struct ast_channel *chan, void *data) cnt = conf->users; else cnt = 0; - if (chan->state != AST_STATE_UP) + if (chan->_state != AST_STATE_UP) ast_answer(chan); res = ast_say_number(chan, cnt, "", chan->language); LOCAL_USER_REMOVE(u); @@ -431,7 +441,7 @@ static int conf_exec(struct ast_channel *chan, void *data) data = ""; } LOCAL_USER_ADD(u); - if (chan->state != AST_STATE_UP) + if (chan->_state != AST_STATE_UP) ast_answer(chan); retry: /* Parse out the stuff */ -- cgit v1.2.3