summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2017-04-17 13:27:35 +0800
committerJonas Ådahl <jadahl@gmail.com>2017-04-21 17:49:13 +0800
commitba317dcd74baebfd8f8c8dd417ded71f6cc8c771 (patch)
tree9406ea745286e804ff77a42a7c8cc54df8adfb24
parenta8b06afba6e9210171303bfef13f5bbddecc3668 (diff)
downloadmutter-ba317dcd74baebfd8f8c8dd417ded71f6cc8c771.tar.gz
wayland/subsurface: Handle clients committing on destroyed subsurface
A client can still commit state to a destroyed subsurface. It wont update anything on the screen, since the subsurface will not be visible, but mutter should still handle it and not crash. https://bugzilla.gnome.org/show_bug.cgi?id=781391
-rw-r--r--src/wayland/meta-wayland-surface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 99e3dfd9e..a6079eeb6 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -605,7 +605,7 @@ subsurface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role)
meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent = surface->sub.parent;
- if (parent->role)
+ if (parent && parent->role)
return meta_wayland_surface_role_get_toplevel (parent->role);
else
return NULL;