diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2012-01-12 10:34:26 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-01-30 11:12:00 +0000 |
| commit | 5c7e6002529186324b45ae5de02f45bc0b4b6201 (patch) | |
| tree | 73c858b68b7b6112afe197c5a2a9e0902db2474d | |
| parent | eaf64d18e7d4ab9bd889440fd94f66783dd49280 (diff) | |
| download | clutter-5c7e6002529186324b45ae5de02f45bc0b4b6201.tar.gz | |
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>
| -rw-r--r-- | 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 2454f233e..f1b763554 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; } |