From 637ef84d040a89ea843b9d3dd1da19229f4d7589 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 29 Nov 2022 19:25:54 -0500 Subject: colordialogbutton: Survive window closing If the parent window of the button gets destroyed while the dialog is open, we cancel the async op, but we need to be a little more careful about not stepping on glass. --- gtk/gtkcolordialogbutton.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk/gtkcolordialogbutton.c b/gtk/gtkcolordialogbutton.c index 76e007f6cc..10f527febf 100644 --- a/gtk/gtkcolordialogbutton.c +++ b/gtk/gtkcolordialogbutton.c @@ -338,8 +338,9 @@ drag_prepare (GtkDragSource *source, static void update_button_sensitivity (GtkColorDialogButton *self) { - gtk_widget_set_sensitive (self->button, - self->dialog != NULL && self->cancellable == NULL); + if (self->button) + gtk_widget_set_sensitive (self->button, + self->dialog != NULL && self->cancellable == NULL); } static void @@ -347,10 +348,11 @@ color_chosen (GObject *source, GAsyncResult *result, gpointer data) { + GtkColorDialog *dialog = GTK_COLOR_DIALOG (source); GtkColorDialogButton *self = data; GdkRGBA *color; - color = gtk_color_dialog_choose_rgba_finish (self->dialog, result, NULL); + color = gtk_color_dialog_choose_rgba_finish (dialog, result, NULL); if (color) { gtk_color_dialog_button_set_rgba (self, color); -- cgit v1.2.1