isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/subsurface: Return NULL as toplevel if parent has no role

Browse Source 
There is nothing stopping a subsurface from commiting its state before
its parents role has been assigned. Thus, we need to handle
meta_wayland_surface_get_toplevel() returning NULL for subsurfaces even
on commit.
This commit is contained in:
Jonas Ådahl 2016-08-24 14:02:33 +08:00
parent 4cf14c41ef
commit b3f27de710
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,7 +594,10 @@ subsurface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent = surface->sub.parent; MetaWaylandSurface *parent = surface->sub.parent;
return meta_wayland_surface_role_get_toplevel (parent->role); if (parent->role)
return meta_wayland_surface_role_get_toplevel (parent->role);
else
return NULL;
} }
/* A non-subsurface is always desynchronized. /* A non-subsurface is always desynchronized.