From d0b2229ebdf2a6569b092d4adf4ad7a984b2ef15 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 8 Feb 2007 22:48:47 +0000
Subject: 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
---
 apps/app_meetme.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apps/app_meetme.c')

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);
-- 
cgit v1.2.3