[maemo-commits] [maemo-commits] r17688 - in projects/haf/trunk/clutter0.8: clutter debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-03-16 12:38:10 +0200 (Mon, 16 Mar 2009)
New Revision: 17688

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
  * Fix for NB#104132 - crash while trying to queue redraw on exit


Modified: projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-03-16 09:38:36 UTC (rev 17687)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-03-16 10:38:10 UTC (rev 17688)
@@ -3039,7 +3039,8 @@
 
   g_return_if_fail (CLUTTER_IS_ACTOR (self));
 
-  if (!self->priv->allow_redraw)
+  if (!self->priv->allow_redraw ||
+      (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IN_DESTRUCTION))
     return;
 
   clutter_actor_notify_modified( self );

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-03-16 09:38:36 UTC (rev 17687)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-03-16 10:38:10 UTC (rev 17688)
@@ -1,3 +1,9 @@
+clutter (0.8.2-0maemo22-unreleased) unstable; urgency=low
+
+  * Fix for NB#104132 - crash while trying to queue redraw on exit
+
+ -- Gordon Williams <gordon.williams at collabora.co.uk>  Thu, 16 Mar 2009 10:29:55 +0000
+
 clutter (0.8.2-0maemo21) unstable; urgency=low
 
   * Moved back to 24/32 bit textures