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

wayland: Fix subsurface place_above/below type cast error

Browse Source 
A MetaWaylandSurface was casted into a ClutterActor, but it should have
been the MetaSurfaceActor.

Move out parent_actor and surface_actor out of the loop while at it
since they won't change when iterating.

https://bugzilla.gnome.org/show_bug.cgi?id=745655
This commit is contained in:
Jonas Ådahl 2015-03-05 12:15:51 +08:00
parent 3b993131e8
commit 208da2316d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wayland/meta-wayland-surface.c
View File

@ -430,11 +430,15 @@ parent_surface_state_applied (gpointer data, gpointer user_data)
if (surface->sub.pending_placement_ops) if (surface->sub.pending_placement_ops)
{ {
GSList *it; GSList *it;
MetaWaylandSurface *parent = surface->sub.parent;
ClutterActor *parent_actor =
clutter_actor_get_parent (CLUTTER_ACTOR (parent->surface_actor));
ClutterActor *surface_actor =
surface_actor = CLUTTER_ACTOR (surface->surface_actor);
for (it = surface->sub.pending_placement_ops; it; it = it->next) for (it = surface->sub.pending_placement_ops; it; it = it->next)
{ {
MetaWaylandSubsurfacePlacementOp *op = it->data; MetaWaylandSubsurfacePlacementOp *op = it->data;
ClutterActor *surface_actor;
ClutterActor *parent_actor;
ClutterActor *sibling_actor; ClutterActor *sibling_actor;
if (!op->sibling) if (!op->sibling)
@ -443,8 +447,6 @@ parent_surface_state_applied (gpointer data, gpointer user_data)
continue; continue;
} }
surface_actor = CLUTTER_ACTOR (surface->surface_actor);
parent_actor = clutter_actor_get_parent (CLUTTER_ACTOR (surface->sub.parent));
sibling_actor = CLUTTER_ACTOR (op->sibling->surface_actor); sibling_actor = CLUTTER_ACTOR (op->sibling->surface_actor);
switch (op->placement) switch (op->placement)