From 43151edecef50f3549c72931bf6534432c4394cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 19 Aug 2016 15:15:27 +0800 Subject: [PATCH] wayland/actor-surface-role: Check for toplevel window Don't check whether the surface of the role has a window, but whether the corresponding toplevel surface has a window. This is necessary to make subsurfaces not always early out. https://bugzilla.gnome.org/show_bug.cgi?id=770131 --- src/wayland/meta-wayland-surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 5ce2b397c..77fbed3cd 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -1999,10 +1999,12 @@ actor_surface_commit (MetaWaylandSurfaceRole *surface_role, { MetaWaylandSurface *surface = meta_wayland_surface_role_get_surface (surface_role); + MetaWaylandSurface *toplevel_surface; queue_surface_actor_frame_callbacks (surface, pending); - if (!surface->window) + toplevel_surface = meta_wayland_surface_get_toplevel (surface); + if (!toplevel_surface || !toplevel_surface->window) return; meta_surface_actor_wayland_sync_state (