diff options
author | Simon Ser <contact@emersion.fr> | 2020-07-02 13:48:57 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-07-15 19:22:39 +0200 |
commit | 1c5046d7e421ea5d90a360e3e08ea2ff67db4561 (patch) | |
tree | 865e0f60b39d410e7af1338129bf00a8364363fc /sway/input | |
parent | seat: fix segfault in sway_input_method_relay_set_focus (diff) | |
download | sway-1c5046d7e421ea5d90a360e3e08ea2ff67db4561.tar.gz sway-1c5046d7e421ea5d90a360e3e08ea2ff67db4561.tar.zst sway-1c5046d7e421ea5d90a360e3e08ea2ff67db4561.zip |
Don't set xwayland cursor when wlr_xwayland failed
This causes a NULL pointer dereference.
(cherry picked from commit dfccd2a4c483a6ff03350cd4ac5e3fada1f40f2e)
Diffstat (limited to 'sway/input')
-rw-r--r-- | sway/input/seat.c | 2 |
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)) { |