From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Thu, 4 Oct 2007 12:32:28 +0000 (+0100)
Subject: minor oss support corrections
X-Git-Tag: debian-1_5_99dev8~139
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/c62ae9477861a63b7958b58384bfbffb11c37347

minor oss support corrections
---

diff --git a/server/speaker-oss.c b/server/speaker-oss.c
index f9a298c..9f409d5 100644
--- a/server/speaker-oss.c
+++ b/server/speaker-oss.c
@@ -71,6 +71,10 @@ static void oss_activate(void) {
 	device = "/dev/dsp";
       else if(access("/dev/audio", W_OK) == 0)
 	device = "/dev/audio";
+      else {
+        error(0, "cannot determine default OSS device");
+        goto failed;
+      }
     } else
       device = config->device;	/* just believe the user */
     /* Open the device */
@@ -111,8 +115,10 @@ static void oss_activate(void) {
   return;
 failed:
   device_state = device_error;
-  if(ossfd >= 0)
+  if(ossfd >= 0) {
     xclose(ossfd);
+    ossfd = -1;
+  }
 }
 
 /** @brief Play via OSS */