summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2007-12-06 14:40:44 +0000
committerOlle Johansson <oej@edvina.net>2007-12-06 14:40:44 +0000
commit478df6c69f08ddd434d6e1151709653c9cffe093 (patch)
tree1161502065c545d75bd1c71135df66656c1db6dc /apps
parenta545aaae53442ef6bd3b312b3ed6aada4d20ead5 (diff)
A big oops...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f97bbc13b..12c392e7e 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1891,13 +1891,14 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
"Channel: %s\r\n"
"Uniqueid: %s\r\n"
"Meetme: %s\r\n"
+ "Usernum: %d\r\n"
"CallerIDnum: %s\r\n"
"CallerIDname: %s\r\n"
- "Duration: %ld\r\n",
chan->name, chan->uniqueid, conf->confno,
- user->user_no,
- S_OR(user->chan->cid.cid_num, "<unknown>"),
- S_OR(user->chan->cid.cid_name, "<unknown>"),
+ user->user_no,
+ S_OR(user->chan->cid.cid_num, "<unknown>"),
+ S_OR(user->chan->cid.cid_name, "<unknown>")
+ );
sent_event = 1;
}
@@ -5196,6 +5197,9 @@ static void sla_destroy(void)
pthread_join(sla.thread, NULL);
}
+ /* Drop any created contexts from the dialplan */
+ ast_context_destroy(NULL, sla_registrar);
+
ast_mutex_destroy(&sla.lock);
ast_cond_destroy(&sla.cond);
}