aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2020-07-02 13:48:57 +0200
committerLibravatar Tudor Brindus <me@tbrindus.ca>2020-07-02 23:55:56 -0400
commitdfccd2a4c483a6ff03350cd4ac5e3fada1f40f2e (patch)
treeafbe8228c4db10f68eda5bc1de672a692956f3fb
parentseat: fix segfault in sway_input_method_relay_set_focus (diff)
downloadsway-dfccd2a4c483a6ff03350cd4ac5e3fada1f40f2e.tar.gz
sway-dfccd2a4c483a6ff03350cd4ac5e3fada1f40f2e.tar.zst
sway-dfccd2a4c483a6ff03350cd4ac5e3fada1f40f2e.zip
Don't set xwayland cursor when wlr_xwayland failed
This causes a NULL pointer dereference.
-rw-r--r--sway/input/seat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 1e987360..656e3e7e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -925,7 +925,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
925 } 925 }
926 926
927#if HAVE_XWAYLAND 927#if HAVE_XWAYLAND
928 if (config->xwayland && (!server.xwayland.xcursor_manager || 928 if (server.xwayland.wlr_xwayland && (!server.xwayland.xcursor_manager ||
929 !xcursor_manager_is_named(server.xwayland.xcursor_manager, 929 !xcursor_manager_is_named(server.xwayland.xcursor_manager,
930 cursor_theme) || 930 cursor_theme) ||
931 server.xwayland.xcursor_manager->size != cursor_size)) { 931 server.xwayland.xcursor_manager->size != cursor_size)) {