[asterisk-commits] qwell: trunk r90697 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Dec  3 16:07:57 2007
New Revision: 90697

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90697
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=90697&r1=90696&r2=90697
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Mon Dec  3 16:07:57 2007
@@ -1349,7 +1349,7 @@
 		ast_hangup(conf->lchan);
 	if (conf->chan)
 		ast_hangup(conf->chan);
-	else
+	if (conf->fd >= 0)
 		close(conf->fd);
 
 	ast_mutex_destroy(&conf->playlock);