From 15af14d933455efcd77739707400e4d7f75f10b3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 30 Apr 2008 16:27:18 +0000 Subject: [PATCH] 2008-04-30 Emmanuele Bassi * clutter/clutter-effect.c: (clutter_effect_closure_destroy): Do not remove the actor from the behaviour; the behaviour is an internal detail of the effect, and it will remove the actors anyway when finalized when g_object_unref() is called. This should guard against actors being destroyed while an effect is running. --- ChangeLog | 9 +++++++++ clutter/clutter-effect.c | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f5cfc890b..e054174ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-04-30 Emmanuele Bassi + + * clutter/clutter-effect.c: + (clutter_effect_closure_destroy): Do not remove the actor + from the behaviour; the behaviour is an internal detail of the + effect, and it will remove the actors anyway when finalized + when g_object_unref() is called. This should guard against + actors being destroyed while an effect is running. + 2008-04-30 Øyvind Kolås * clutter/cogl/common/Makefile.am: diff --git a/clutter/clutter-effect.c b/clutter/clutter-effect.c index eac586f50..fa8a7bef5 100644 --- a/clutter/clutter-effect.c +++ b/clutter/clutter-effect.c @@ -484,7 +484,6 @@ static void clutter_effect_closure_destroy (ClutterEffectClosure *c) { g_signal_handler_disconnect (c->timeline, c->signal_id); - clutter_behaviour_remove (c->behave, c->actor); g_object_unref (c->actor); g_object_unref (c->template);