[asterisk-commits] trunk - r7583 in /trunk: ./ channels/chan_alsa.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Wed Dec 21 14:02:36 2005
New Revision: 7583

URL: http://svn.digium.com/view/asterisk?rev=7583&view=rev
Log:
Merged revisions 7582 via svnmerge from
/branches/1.2

Modified:
    trunk/   (props changed)
    trunk/channels/chan_alsa.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 21 14:02:36 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7515,7519,7521,7523,7577
+/branches/1.2:1-7489,7491-7496,7498-7515,7519,7521,7523,7577,7582

Modified: trunk/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_alsa.c?rev=7583&r1=7582&r2=7583&view=diff
==============================================================================
--- trunk/channels/chan_alsa.c (original)
+++ trunk/channels/chan_alsa.c Wed Dec 21 14:02:36 2005
@@ -1109,8 +1109,10 @@
 	ast_channel_unregister(&alsa_tech);
 	for (x=0;x<sizeof(myclis)/sizeof(struct ast_cli_entry); x++)
 		ast_cli_unregister(myclis + x);
-	snd_pcm_close(alsa.icard);
-	snd_pcm_close(alsa.ocard);
+	if (alsa.icard)
+		snd_pcm_close(alsa.icard);
+	if (alsa.ocard)
+		snd_pcm_close(alsa.ocard);
 	if (sndcmd[0] > 0) {
 		close(sndcmd[0]);
 		close(sndcmd[1]);