changeset 109248:f969130f2bb4

* image.c (free_image): Mark frame as garbaged (Bug#6426).
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 19 Jun 2010 15:43:47 -0400
parents 297ccb6a6278
children 452ecb3f69c0
files src/ChangeLog src/image.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jun 19 14:06:37 2010 -0400
+++ b/src/ChangeLog	Sat Jun 19 15:43:47 2010 -0400
@@ -1,5 +1,7 @@
 2010-06-19  Chong Yidong  <cyd@stupidchicken.com>
 
+	* image.c (free_image): Mark frame as garbaged (Bug#6426).
+
 	* keymap.c (Fdefine_key): Doc fix (Bug#6460).
 
 2010-06-15  Glenn Morris  <rgm@gnu.org>
--- a/src/image.c	Sat Jun 19 14:06:37 2010 -0400
+++ b/src/image.c	Sat Jun 19 15:43:47 2010 -0400
@@ -1094,6 +1094,10 @@
       /* Free resources, then free IMG.  */
       img->type->free (f, img);
       xfree (img);
+
+      /* As display glyphs may still be referring to the image ID, we
+	 must garbage the frame (Bug#6426).  */
+      SET_FRAME_GARBAGED (f);
     }
 }