From e3f8316d08e211d20fb0771576d4209e763b64ab Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 20 Jan 2016 05:09:25 +0100 Subject: [PATCH] viewport: Don't destroy pixelcache while it's still used Removing the child unsets the pxielcache's style context... --- gtk/gtkviewport.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 3edf5ec47d..368374c5e3 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -574,13 +574,11 @@ gtk_viewport_destroy (GtkWidget *widget) viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL); viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL); - if (priv->pixel_cache) - _gtk_pixel_cache_free (priv->pixel_cache); - priv->pixel_cache = NULL; - g_clear_object (&priv->gadget); GTK_WIDGET_CLASS (gtk_viewport_parent_class)->destroy (widget); + + g_clear_pointer (&priv->pixel_cache, _gtk_pixel_cache_free); } /**