diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-08 22:48:47 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-08 22:48:47 +0000 |
commit | d0b2229ebdf2a6569b092d4adf4ad7a984b2ef15 (patch) | |
tree | 9486a727b8e1260f7df7e56c9f2dbfa10936f2a4 /apps/app_meetme.c | |
parent | 908810e23f7815eccab97be7023a1aed15f89464 (diff) |
merge up to branch 1.2 and re-enable automerge
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@53671 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r-- | apps/app_meetme.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a29289ed8..1efd4bbb4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -862,6 +862,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_verbose(VERBOSE_PREFIX_4 "Starting recording of MeetMe Conference %s into file %s.%s.\n", conf->confno, conf->recordingfilename, conf->recordingformat); ast_pthread_create(&conf->recordthread, &conf->attr, recordthread, conf); + pthread_attr_destroy(&conf->attr); } time(&user->jointime); |