Skip to content

Commit 82cba78

Browse files
committed
meta-stage: Remove backend assertions from overlay paint/update paths
Software cursor overlays are required as a fallback when the cursor theme is missing a required cursor name. Two assertions were preventing X11 from using this fallback, resulting in a crash. See the bug report below for details. Fixes #801 With this commit in place, we no longer crash. We get a missing cursor instead.
1 parent 5af60b3 commit 82cba78

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

src/backends/meta-stage.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ meta_overlay_paint (MetaOverlay *overlay,
126126
if (!overlay->enabled)
127127
return;
128128

129-
g_assert (meta_is_wayland_compositor ());
130-
131129
framebuffer = clutter_paint_context_get_framebuffer (paint_context);
132130
cogl_framebuffer_draw_rectangle (framebuffer,
133131
overlay->pipeline,
@@ -385,8 +383,6 @@ meta_stage_update_cursor_overlay (MetaStage *stage,
385383
CoglTexture *texture,
386384
graphene_rect_t *rect)
387385
{
388-
g_assert (meta_is_wayland_compositor () || texture == NULL);
389-
390386
meta_overlay_set (overlay, texture, rect);
391387
queue_redraw_for_overlay (stage, overlay);
392388
}

0 commit comments

Comments
 (0)