isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 21:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed crash in clutter_group_raise / _lower()

Browse Source
This commit is contained in:
Tomas Frydrych 2007-06-28 15:18:20 +00:00
parent ca450782cb
commit 1677e9d263
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-28 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-group.c:
(clutter_group_raise):
(clutter_group_lower):
Fixed SIGSEGV when attempting to raise / lower an only child.
2007-06-28 Matthew Allum <mallum@openedhand.com> 2007-06-28 Matthew Allum <mallum@openedhand.com>
* clutter/cogl/gl/cogl.c: (cogl_setup_viewport): * clutter/cogl/gl/cogl.c: (cogl_setup_viewport):

15
clutter/clutter-group.c
View File

@ -596,7 +596,10 @@ clutter_group_raise (ClutterGroup *self,
/* Raise top */ /* Raise top */
last_item = g_list_last (priv->children); last_item = g_list_last (priv->children);
sibling = last_item->data;
if (last_item)
sibling = last_item->data;
priv->children = g_list_append (priv->children, actor); priv->children = g_list_append (priv->children, actor);
} }
else else
@ -609,7 +612,8 @@ clutter_group_raise (ClutterGroup *self,
* values will be correct. * values will be correct.
* FIXME: optimise * FIXME: optimise
*/ */
if (clutter_actor_get_depth(sibling) != clutter_actor_get_depth (actor)) if ( sibling &&
clutter_actor_get_depth(sibling) != clutter_actor_get_depth (actor))
clutter_actor_set_depth (actor, clutter_actor_set_depth (actor,
clutter_actor_get_depth (sibling)); clutter_actor_get_depth (sibling));
@ -644,7 +648,9 @@ clutter_group_lower (ClutterGroup *self,
GList *last_item; GList *last_item;
/* Raise top */ /* Raise top */
last_item = g_list_first (priv->children); last_item = g_list_first (priv->children);
sibling = last_item->data;
if (last_item)
sibling = last_item->data;
priv->children = g_list_prepend (priv->children, actor); priv->children = g_list_prepend (priv->children, actor);
} }
@ -652,7 +658,8 @@ clutter_group_lower (ClutterGroup *self,
priv->children = g_list_insert (priv->children, actor, pos); priv->children = g_list_insert (priv->children, actor, pos);
/* See comment in group_raise for this */ /* See comment in group_raise for this */
if (clutter_actor_get_depth(sibling) != clutter_actor_get_depth(actor)) if (sibling &&
clutter_actor_get_depth(sibling) != clutter_actor_get_depth(actor))
clutter_actor_set_depth (actor, clutter_actor_set_depth (actor,
clutter_actor_get_depth(sibling)); clutter_actor_get_depth(sibling));
} }