Merge branch 'scrolled-window-critical' into 'main'

scrolledwindow: Avoid a critical

See merge request GNOME/gtk!5809

2 files changed, 5 insertions, 3 deletions

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index b81777784b..fed7c32eed 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -4202,9 +4202,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,
@@ -4212,6 +4210,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)
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index d9bdc2eb07..3f313ac435 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -383,6 +383,9 @@ check_property (GObject *instance, GParamSpec *pspec)
       g_object_set (instance, pspec->name, NULL, NULL);
       assert_notifies (instance, pspec->name, data.count, 2);
 
+      g_object_set (instance, pspec->name, value, NULL);
+      assert_notifies (instance, pspec->name, data.count, 3);
+
       g_object_unref (value);
 
       g_signal_handler_disconnect (instance, id);