From b9574e119bfe03530ee2f8ed82663fa81ceb2b30 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Tue, 17 May 2022 12:28:25 -0700 Subject: [PATCH] checkbutton: fix critical when setting use-underline This needs to make sure that we've created the label before applying the setting on a child widget. Fixes #4934 --- gtk/gtkcheckbutton.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index c97fa815e1..12a08b4452 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -959,7 +959,7 @@ gtk_check_button_set_label (GtkCheckButton *self, gtk_label_set_use_underline (GTK_LABEL (child), priv->use_underline); gtk_check_button_real_set_child (self, GTK_WIDGET (child), LABEL_CHILD); } - + gtk_widget_add_css_class (GTK_WIDGET (self), "text-button"); gtk_label_set_label (GTK_LABEL (priv->child), label); } @@ -1099,7 +1099,7 @@ gtk_check_button_set_use_underline (GtkCheckButton *self, return; priv->use_underline = setting; - if (priv->child_type == LABEL_CHILD) + if (priv->child_type == LABEL_CHILD && priv->child != NULL) gtk_label_set_use_underline (GTK_LABEL (priv->child), priv->use_underline); g_object_notify_by_pspec (G_OBJECT (self), props[PROP_USE_UNDERLINE]);