diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2012-05-17 18:08:57 -0400 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-05-25 15:13:30 +0100 |
| commit | d3fcd6e371a7dbf2213ba809a4f4e407a2533131 (patch) | |
| tree | ba76b7f1e75f830470bb625b6df6a5608a3ba22d | |
| parent | 95f17f28af89cfcb7eabab7e384f23828e5b5c19 (diff) | |
| download | clutter-d3fcd6e371a7dbf2213ba809a4f4e407a2533131.tar.gz | |
ClutterDropAction: Avoid accessing priv->stage is not yet resolved.
This fixes drop_action_unregister() to not call g_object_get_data()
on priv->stage if not yet resolved. This can happen if the action's
actor was destroyed before ever being mapped.
| -rw-r--r-- | clutter/clutter-drop-action.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clutter/clutter-drop-action.c b/clutter/clutter-drop-action.c index 90b238fb9..0655ec9fc 100644 --- a/clutter/clutter-drop-action.c +++ b/clutter/clutter-drop-action.c @@ -268,9 +268,11 @@ static void drop_action_unregister (ClutterDropAction *self) { ClutterDropActionPrivate *priv = self->priv; - DropTarget *data; + DropTarget *data = NULL; + + if (priv->stage != NULL) + data = g_object_get_data (G_OBJECT (priv->stage), "__clutter_drop_targets"); - data = g_object_get_data (G_OBJECT (priv->stage), "__clutter_drop_targets"); if (data == NULL) return; |