From a3fc65185b20a88e37d32cc40f61fd13ec9b281d Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Sun, 23 Feb 2020 14:07:45 -0800 Subject: [PATCH] cally: avoid creating accessible during actor removal If the ClutterActor does not have an accessible created, then avoid requesting one. Without this, we risk creating an accessible during the removal of the actor. https://gitlab.gnome.org/GNOME/mutter/merge_requests/1083 --- clutter/clutter/cally/cally-actor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clutter/clutter/cally/cally-actor.c b/clutter/clutter/cally/cally-actor.c index c92b576e1..91f68d492 100644 --- a/clutter/clutter/cally/cally-actor.c +++ b/clutter/clutter/cally/cally-actor.c @@ -600,10 +600,11 @@ cally_actor_real_remove_actor (ClutterActor *container, g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), 0); atk_parent = ATK_OBJECT (data); - atk_child = clutter_actor_get_accessible (actor); - if (atk_child) + if (clutter_actor_has_accessible (actor)) { + atk_child = clutter_actor_get_accessible (actor); + g_value_init (&values.old_value, G_TYPE_POINTER); g_value_set_pointer (&values.old_value, atk_parent);