From 51f6129578342687f96b9f2a4c886853568203ee Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Apr 2023 00:22:20 -0400 Subject: [PATCH] scrolledwindow: Avoid a critical When setting the child property to NULL, we also need to unset auto_added_viewport, to avoid triggering a critical when setting it again. --- gtk/gtkscrolledwindow.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index be3ab0d4fc..126cf7f30e 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -4194,9 +4194,7 @@ gtk_scrolled_window_set_child (GtkScrolledWindow *scrolled_window, if (priv->child) { if (priv->auto_added_viewport) - { - gtk_viewport_set_child (GTK_VIEWPORT (priv->child), NULL); - } + gtk_viewport_set_child (GTK_VIEWPORT (priv->child), NULL); g_object_set (priv->child, "hadjustment", NULL, @@ -4204,6 +4202,7 @@ gtk_scrolled_window_set_child (GtkScrolledWindow *scrolled_window, NULL); g_clear_pointer (&priv->child, gtk_widget_unparent); + priv->auto_added_viewport = FALSE; } if (child)