[clutter/clutter-1.8] deform-effect: Check against NULL pointers



commit 5c7e6002529186324b45ae5de02f45bc0b4b6201
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Jan 12 10:34:26 2012 +0000

    deform-effect: Check against NULL pointers
    
    Do not try to disconnect signal handlers from NULL pointers.
    (cherry picked from commit cce2e25ac7ef395d880352c93272256ea088c2dd)
    
    Signed-off-by: Emmanuele Bassi <ebassi linux intel com>

 clutter/clutter-deform-effect.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/clutter/clutter-deform-effect.c b/clutter/clutter-deform-effect.c
index 2454f23..f1b7635 100644
--- a/clutter/clutter-deform-effect.c
+++ b/clutter/clutter-deform-effect.c
@@ -148,7 +148,9 @@ clutter_deform_effect_set_actor (ClutterActorMeta *meta,
     {
       ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);
 
-      g_signal_handler_disconnect (old_actor, priv->allocation_id);
+      if (old_actor != NULL)
+        g_signal_handler_disconnect (old_actor, priv->allocation_id);
+
       priv->allocation_id = 0;
     }
 



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