[clutter/clutter-1.10] ClutterDropAction: Avoid accessing priv->stage is not yet resolved.



commit d3fcd6e371a7dbf2213ba809a4f4e407a2533131
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu May 17 18:08:57 2012 -0400

    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.

 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 90b238f..0655ec9 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;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]