aboutsummaryrefslogtreecommitdiffstats
path: root/src/xfns.c
diff options
context:
space:
mode:
authorGerd Moellmann2001-09-25 17:43:10 +0000
committerGerd Moellmann2001-09-25 17:43:10 +0000
commitdaba7643145774bf021cd91407d056d99e91f008 (patch)
treecc01e2b62189819fd0a3b33758751495253f8449 /src/xfns.c
parentee39b98802fd7b4c03970caf01a5d535ad0645a1 (diff)
downloademacs-daba7643145774bf021cd91407d056d99e91f008.tar.gz
emacs-daba7643145774bf021cd91407d056d99e91f008.zip
(x_kill_gs_process): Recognize if someone has cleared
the image cache under us.
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c
index e2690e7a30e..cc778d833e3 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -10117,9 +10117,13 @@ x_kill_gs_process (pixmap, f)
10117 if (c->images[i]->pixmap == pixmap) 10117 if (c->images[i]->pixmap == pixmap)
10118 break; 10118 break;
10119 10119
10120 /* Should someone in between have cleared the image cache, for
10121 instance, give up. */
10122 if (i == c->used)
10123 return;
10124
10120 /* Kill the GS process. We should have found PIXMAP in the image 10125 /* Kill the GS process. We should have found PIXMAP in the image
10121 cache and its image should contain a process object. */ 10126 cache and its image should contain a process object. */
10122 xassert (i < c->used);
10123 img = c->images[i]; 10127 img = c->images[i];
10124 xassert (PROCESSP (img->data.lisp_val)); 10128 xassert (PROCESSP (img->data.lisp_val));
10125 Fkill_process (img->data.lisp_val, Qnil); 10129 Fkill_process (img->data.lisp_val, Qnil);