[asterisk-commits] qwell: branch 1.6.2 r305472 - in /branches/1.6.2: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Feb  1 11:02:09 2011
New Revision: 305472

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305472
Log:
Merged revisions 305471 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r305471 | qwell | 2011-02-01 11:00:55 -0600 (Tue, 01 Feb 2011) | 9 lines
  
  Close file descriptor for timing source when a MOH class gets destroyed.
  
  (closes issue #18457)
  Reported by: mcallist
  Patches: 
        18457-closetimer.diff uploaded by qwell (license 4)
        18457-closetimer_trunk.diff uploaded by qwell (license 4)
  Tested by: qwell, loloski
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/res_musiconhold.c

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

Modified: branches/1.6.2/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_musiconhold.c?view=diff&rev=305472&r1=305471&r2=305472
==============================================================================
--- branches/1.6.2/res/res_musiconhold.c (original)
+++ branches/1.6.2/res/res_musiconhold.c Tue Feb  1 11:02:09 2011
@@ -1559,6 +1559,11 @@
 		free(member);
 	}
 
+	if (class->pseudofd > -1) {
+		close(class->pseudofd);
+		class->pseudofd = -1;
+	}
+
 	if (class->filearray) {
 		int i;
 		for (i = 0; i < class->total_files; i++) {