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

click-action: Be resilient against NULL pointers

Browse Source 
Do not try to disconnect signal handlers from NULL pointers.
This commit is contained in:
Emmanuele Bassi 2012-01-12 10:26:47 +00:00
parent 8e6b3914ef
commit dbf3b607bf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter-click-action.c
View File

@ -433,13 +433,17 @@ clutter_click_action_set_actor (ClutterActorMeta *meta,
{ {
ClutterActor *old_actor = clutter_actor_meta_get_actor (meta); ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);
if (old_actor != NULL)
g_signal_handler_disconnect (old_actor, priv->event_id); g_signal_handler_disconnect (old_actor, priv->event_id);
priv->event_id = 0; priv->event_id = 0;
} }
if (priv->capture_id != 0) if (priv->capture_id != 0)
{ {
if (priv->stage != NULL)
g_signal_handler_disconnect (priv->stage, priv->capture_id); g_signal_handler_disconnect (priv->stage, priv->capture_id);
priv->capture_id = 0; priv->capture_id = 0;
priv->stage = NULL; priv->stage = NULL;
} }