summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Stoeckl <code@mstoeckl.com>2024-11-08 19:44:30 -0500
committerSimon Ser <contact@emersion.fr>2024-11-28 20:39:30 +0100
commit79c8197381e0e2cffc65c670702d50cbafcccbbd (patch)
treec74f15b61cc3b66b8cb1d2189decb04b3b23aa0c
parent97e2556de7e370e14ac1e8e7608c72173dafba55 (diff)
swaynag: fix null dereference on scale change
If cursor-shape-v1 is available, the old wl_cursor_theme path should not be used. (cherry picked from commit 03483ff3707a358d935e451d39748e58c205ce8a)
-rw-r--r--swaynag/swaynag.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
index 50eea148..da32eeb7 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -324,7 +324,9 @@ static void output_scale(void *data, struct wl_output *output,
swaynag_output->scale = factor;
if (swaynag_output->swaynag->output == swaynag_output) {
swaynag_output->swaynag->scale = swaynag_output->scale;
- update_all_cursors(swaynag_output->swaynag);
+ if (!swaynag_output->swaynag->cursor_shape_manager) {
+ update_all_cursors(swaynag_output->swaynag);
+ }
render_frame(swaynag_output->swaynag);
}
}