* sound.c (sound_cleanup): Don't call device close routine if pointer is null.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f1696327a7aa3645c4c4712ec9a62e0506465c1..c5931e790c075500ae9d0feec356821b2649afc6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-06  Ken Raeburn  <raeburn@gnu.org>
+
+       * sound.c (sound_cleanup): Don't call device close routine if the
+       function pointer is null.
+
 2000-02-06  Andrew Innes  <andrewi@gnu.org>
 
        * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
@@ -51,13 +56,13 @@
 
        * s/msdos.h (SYSTEM_PURESIZE_EXTRA): Enlarge to 60000.
 
-2000-02-03  Ken Raeburn  <raeburn@raeburn.org>
+2000-02-03  Ken Raeburn  <raeburn@gnu.org>
 
        * search.c (compile_pattern): If a cache entry has a nil regexp,
        fill in that entry instead of clobbering a previously cached
        string regexp.
 
-2000-02-02  Ken Raeburn  <raeburn@raeburn.org>
+2000-02-02  Ken Raeburn  <raeburn@gnu.org>
 
        * puresize.h (BASE_PURESIZE): Increase to 610000.
 
@@ -2051,7 +2056,7 @@
 
        * regex.c (POP_FAILURE_POINT): Extract failure_id as an integer.
 
-1999-10-24  Ken Raeburn  <raeburn@raeburn.org>
+1999-10-24  Ken Raeburn  <raeburn@gnu.org>
 
        * alloc.c: Undef HIDE_LISP_IMPLEMENTATION before including
        lisp.h.

diff --git a/src/sound.c b/src/sound.c
index 0f0706e5db3936dc218d58e5e1c6b5c1142b6bf3..52fe1c18bcd05e17773351a6da6548562abd6852 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -347,7 +347,8 @@ sound_cleanup (arg)
 {
   if (current_sound_device)
     {
-      current_sound_device->close (current_sound_device);
+      if (current_sound_device->close)
+       current_sound_device->close (current_sound_device);
       if (current_sound->fd > 0)
        emacs_close (current_sound->fd);
     }