]> Pileus Git - ~andy/gtk/commitdiff
Avoid drawing implicit paints to destroyed windows
authorAlexander Larsson <alexl@redhat.com>
Fri, 15 Jan 2010 15:06:12 +0000 (16:06 +0100)
committerAlexander Larsson <alexl@redhat.com>
Fri, 15 Jan 2010 15:08:18 +0000 (16:08 +0100)
It may happen that a window gets destroyed during painting, if so
we should not draw the implicit paint double-buffered pixmap to it
as that will cause a BadDrawable X error.

This fixes bug 600865

gdk/gdkwindow.c

index eeaee78b3445324887422681fa0e659ebf3dcb4b..9e6b14a736f7aa3901496983deac76a6545fbf3c 100644 (file)
@@ -2679,7 +2679,7 @@ gdk_window_flush_implicit_paint (GdkWindow *window)
   gdk_region_offset (region, private->abs_x, private->abs_y);
   gdk_region_intersect (region, paint->region);
 
-  if (!gdk_region_empty (region))
+  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (region))
     {
       /* Remove flushed region from the implicit paint */
       gdk_region_subtract (paint->region, region);
@@ -2712,7 +2712,7 @@ gdk_window_end_implicit_paint (GdkWindow *window)
 
   private->implicit_paint = NULL;
 
-  if (!gdk_region_empty (paint->region))
+  if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (paint->region))
     {
       /* Some regions are valid, push these to window now */
       tmp_gc = _gdk_drawable_get_scratch_gc ((GdkDrawable *)window, FALSE);