[mutter/wip/chergert/has-accessible: 3/3] cally: avoid creating accessible during actor removal

[Christian Hergert <chergert src gnome org>]

commit 842e7d0903dfc295e03d8b15315abc95d1df6037
Author: Christian Hergert <chergert redhat com>
Date:   Sun Feb 23 14:07:45 2020 -0800

    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);