brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gesture-action: Protect against NULL pointers

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-01-12 10:49:16 +00:00
parent 3b9b69ef54
commit 0c365f9f4c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-gesture-action.c
View File

@ -250,13 +250,17 @@ clutter_gesture_action_set_actor (ClutterActorMeta *meta,
{ {
ClutterActor *old_actor = clutter_actor_meta_get_actor (meta); ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);
g_signal_handler_disconnect (old_actor, priv->actor_capture_id); if (old_actor != NULL)
g_signal_handler_disconnect (old_actor, priv->actor_capture_id);
priv->actor_capture_id = 0; priv->actor_capture_id = 0;
} }
if (priv->stage_capture_id != 0) if (priv->stage_capture_id != 0)
{ {
g_signal_handler_disconnect (priv->stage, priv->stage_capture_id); if (priv->stage != NULL)
g_signal_handler_disconnect (priv->stage, priv->stage_capture_id);
priv->stage_capture_id = 0; priv->stage_capture_id = 0;
priv->stage = NULL; priv->stage = NULL;
} }