(x_kill_gs_process): Recognize if someone has cleared

the image cache under us.

diff --git a/src/ChangeLog b/src/ChangeLog
index 509cd8d40050c3fe4c426832dac979e6c3693e39..248d3ac5ad70bf3b05bbe534635aebb45fb818e3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-25  Gerd Moellmann  <gerd@gnu.org>
 
+       * xfns.c (x_kill_gs_process): Recognize if someone has cleared
+       the image cache under us.
+
        * xdisp.c (display_mode_element): If the mode element is a symbol
        with a string value, use that string's multibyteness for
        displaying.

diff --git a/src/xfns.c b/src/xfns.c
index e2690e7a30ecd445ef78208b3306cb54c197474c..cc778d833e35e32f3e837ac28c40979da22d87d3 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10117,9 +10117,13 @@ x_kill_gs_process (pixmap, f)
     if (c->images[i]->pixmap == pixmap)
       break;
 
+  /* Should someone in between have cleared the image cache, for
+     instance, give up.  */
+  if (i == c->used)
+    return;
+  
   /* Kill the GS process.  We should have found PIXMAP in the image
      cache and its image should contain a process object.  */
-  xassert (i < c->used);
   img = c->images[i];
   xassert (PROCESSP (img->data.lisp_val));
   Fkill_process (img->data.lisp_val, Qnil);