[asterisk-commits] mmichelson: branch 1.6.1 r173595 - in /branches/1.6.1: ./ apps/app_mixmonitor.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Feb  5 12:50:00 2009
New Revision: 173595

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173595
Log:
Merged revisions 173593 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r173593 | mmichelson | 2009-02-05 12:48:55 -0600 (Thu, 05 Feb 2009) | 11 lines

Merged revisions 173592 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173592 | mmichelson | 2009-02-05 12:47:24 -0600 (Thu, 05 Feb 2009) | 3 lines

Add some missing cleanup to app_mixmonitor


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_mixmonitor.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_mixmonitor.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_mixmonitor.c?view=diff&rev=173595&r1=173594&r2=173595
==============================================================================
--- branches/1.6.1/apps/app_mixmonitor.c (original)
+++ branches/1.6.1/apps/app_mixmonitor.c Thu Feb  5 12:50:00 2009
@@ -250,6 +250,8 @@
 		ast_cond_wait(&mixmonitor->mixmonitor_ds->destruction_condition, &mixmonitor->mixmonitor_ds->lock);
 	}
 	ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
+	ast_mutex_destroy(&mixmonitor->mixmonitor_ds->lock);
+	ast_cond_destroy(&mixmonitor->mixmonitor_ds->destruction_condition);
 	ast_free(mixmonitor->mixmonitor_ds);
 	ast_free(mixmonitor);