diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2012-01-12 10:26:47 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-01-30 11:11:49 +0000 |
| commit | eaf64d18e7d4ab9bd889440fd94f66783dd49280 (patch) | |
| tree | 2878d6c4fa0bdc86817af90a036779443d92256a | |
| parent | a2f587f1c4621de3f6979e39e83788ee0e8347c5 (diff) | |
| download | clutter-eaf64d18e7d4ab9bd889440fd94f66783dd49280.tar.gz | |
click-action: Be resilient against NULL pointers
Do not try to disconnect signal handlers from NULL pointers.
(cherry picked from commit dbf3b607bf1b295c782ab8edfb2d80bc25f74a37)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
| -rw-r--r-- | clutter/clutter-click-action.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/clutter/clutter-click-action.c b/clutter/clutter-click-action.c index a1246347d..8f0844e17 100644 --- a/clutter/clutter-click-action.c +++ b/clutter/clutter-click-action.c @@ -433,13 +433,17 @@ clutter_click_action_set_actor (ClutterActorMeta *meta, { ClutterActor *old_actor = clutter_actor_meta_get_actor (meta); - g_signal_handler_disconnect (old_actor, priv->event_id); + if (old_actor != NULL) + g_signal_handler_disconnect (old_actor, priv->event_id); + priv->event_id = 0; } if (priv->capture_id != 0) { - g_signal_handler_disconnect (priv->stage, priv->capture_id); + if (priv->stage != NULL) + g_signal_handler_disconnect (priv->stage, priv->capture_id); + priv->capture_id = 0; priv->stage = NULL; } |