summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/wayland/meta-wayland-surface.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index e4a4e5a97..ef9edf61a 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -256,6 +256,12 @@ toplevel_surface_commit (MetaWaylandSurface *surface,
return;
}
}
+ else if (surface->role == META_WAYLAND_SURFACE_ROLE_XDG_POPUP)
+ {
+ /* Ignore commits if we couldn't grab the pointer */
+ if (!window)
+ return;
+ }
else
{
if (surface->buffer == NULL)
@@ -268,6 +274,8 @@ toplevel_surface_commit (MetaWaylandSurface *surface,
}
}
+ g_assert (window != NULL);
+
/* We resize X based surfaces according to X events */
if (window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
{