From 1c5046d7e421ea5d90a360e3e08ea2ff67db4561 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 2 Jul 2020 13:48:57 +0200 Subject: [PATCH] Don't set xwayland cursor when wlr_xwayland failed This causes a NULL pointer dereference. (cherry picked from commit dfccd2a4c483a6ff03350cd4ac5e3fada1f40f2e) --- sway/input/seat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/input/seat.c b/sway/input/seat.c index 1e9873604..656e3e7e8 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -925,7 +925,7 @@ void seat_configure_xcursor(struct sway_seat *seat) { } #if HAVE_XWAYLAND - if (config->xwayland && (!server.xwayland.xcursor_manager || + if (server.xwayland.wlr_xwayland && (!server.xwayland.xcursor_manager || !xcursor_manager_is_named(server.xwayland.xcursor_manager, cursor_theme) || server.xwayland.xcursor_manager->size != cursor_size)) {