[mutter/wip/carlosg/unthrottled-wayland: 6/27] clutter/stage: Free pointer/touch info early during dispose




commit fac9ceb0d311883e15a42d0525b9d5efeb5a3b98
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Aug 25 21:59:52 2021 +0200

    clutter/stage: Free pointer/touch info early during dispose
    
    If we wait till finalize, dispose will destroy the actor hierarchy
    and cause untimely repicks. Ensure to free the pointer/touch info
    first, so the hooked signal callbacks are gone when destroying the
    actors.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1915>

 clutter/clutter/clutter-stage.c | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 3b39aeca7c..ab171efac9 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1196,6 +1196,9 @@ clutter_stage_dispose (GObject *object)
   stage_manager = clutter_stage_manager_get_default ();
   _clutter_stage_manager_remove_stage (stage_manager, stage);
 
+  g_hash_table_remove_all (priv->pointer_devices);
+  g_hash_table_remove_all (priv->touch_sequences);
+
   G_OBJECT_CLASS (clutter_stage_parent_class)->dispose (object);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]