From 69a160f187484400e3e96ef0a1e956a328135907 Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Wed, 13 Aug 2014 22:32:22 +0200 Subject: wayland: pointer interface is created after theme Just always load the theme. It gets freed properly and dosn't bother anyone. Fixes #1012. CC: @mpv-player/stable --- video/out/wayland_common.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'video') diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 0a02ee2bf8..36c6fc0d4b 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -819,20 +819,15 @@ static bool create_cursor (struct vo_wayland_state *wl) return false; } - if (wl->cursor.pointer) { - // only create cursor surface if a pointer interface is available - // without this check it leads to problems with compositor which don't - // have pointer interfaces - wl->cursor.surface = - wl_compositor_create_surface(wl->display.compositor); - - if (!wl->cursor.surface) - return false; + wl->cursor.surface = + wl_compositor_create_surface(wl->display.compositor); - wl->cursor.theme = wl_cursor_theme_load(NULL, 32, wl->display.shm); - wl->cursor.default_cursor = wl_cursor_theme_get_cursor(wl->cursor.theme, - "left_ptr"); - } + if (!wl->cursor.surface) + return false; + + wl->cursor.theme = wl_cursor_theme_load(NULL, 32, wl->display.shm); + wl->cursor.default_cursor = wl_cursor_theme_get_cursor(wl->cursor.theme, + "left_ptr"); return true; } -- cgit v1.2.3