From fdf2e046c3e83faf9d3b0f347b32e9dcc0415995 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 25 Nov 2020 18:13:54 +0000 Subject: [PATCH] a11y: Check before disconnecting selection signals If the selection data has already been cleared we should just bail out. Fixes: #3404 --- gtk/a11y/gtkatspiselection.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gtk/a11y/gtkatspiselection.c b/gtk/a11y/gtkatspiselection.c index 6bc501e57a..adfdbf021a 100644 --- a/gtk/a11y/gtkatspiselection.c +++ b/gtk/a11y/gtkatspiselection.c @@ -1132,6 +1132,8 @@ gtk_atspi_disconnect_selection_signals (GtkAccessible *accessible) SelectionChanged *changed; changed = g_object_get_data (G_OBJECT (accessible), "accessible-selection-data"); + if (changed == NULL) + return; g_signal_handlers_disconnect_by_func (accessible, changed->changed, changed->data); @@ -1143,6 +1145,8 @@ gtk_atspi_disconnect_selection_signals (GtkAccessible *accessible) SelectionChanged *changed; changed = g_object_get_data (G_OBJECT (accessible), "accessible-selection-data"); + if (changed == NULL) + return; g_signal_handlers_disconnect_by_func (notebook, changed->changed, changed->data);