diff options
author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2014-08-13 22:32:22 +0200 |
---|---|---|
committer | Alexander Preisinger <alexander.preisinger@gmail.com> | 2014-08-13 22:34:18 +0200 |
commit | 69a160f187484400e3e96ef0a1e956a328135907 (patch) | |
tree | 1d94422e37832c463ff2cba76429412506d95426 /video | |
parent | 3eaa407c6ff227a4b69b5b81f2a3307dc987fd1c (diff) | |
download | mpv-69a160f187484400e3e96ef0a1e956a328135907.tar.bz2 mpv-69a160f187484400e3e96ef0a1e956a328135907.tar.xz |
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
Diffstat (limited to 'video')
-rw-r--r-- | video/out/wayland_common.c | 21 |
1 files changed, 8 insertions, 13 deletions
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; } |