From d3dd51507242b16570d553775485e44038d041f3 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Mon, 3 Dec 2007 22:07:57 +0000 Subject: Merged revisions 90696 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 (Closes issue #11383) ........ r90696 | qwell | 2007-12-03 16:06:36 -0600 (Mon, 03 Dec 2007) | 4 lines Make sure we always close the conference fd if we have an open one. Issue 11383, reported by markmhy, patch by eliel. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90697 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f39a48155..6341c4165 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1349,7 +1349,7 @@ static int conf_free(struct ast_conference *conf) ast_hangup(conf->lchan); if (conf->chan) ast_hangup(conf->chan); - else + if (conf->fd >= 0) close(conf->fd); ast_mutex_destroy(&conf->playlock); -- cgit v1.2.3