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.
This commit is contained in:
Matthias Clasen 2023-04-10 00:22:20 -04:00
parent 9a10d16f69
commit 51f6129578

View File

@ -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);
}
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)