From e2239c36d334569ee134084af368e549f6790144 Mon Sep 17 00:00:00 2001
From: Frank Praznik <[EMAIL REDACTED]>
Date: Fri, 13 Jun 2025 15:44:44 -0400
Subject: [PATCH] wayland: Ensure that the tablet tool list is always
initialized to empty
Otherwise, it will be left in an uninitialized, non-empty state if the tablet protocol isn't present.
---
src/video/wayland/SDL_waylandevents.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
index 8ade405c33f62..8d591481110f2 100644
--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@@ -3309,7 +3309,6 @@ static const struct zwp_tablet_seat_v2_listener tablet_seat_listener = {
static void Wayland_SeatInitTabletSupport(SDL_WaylandSeat *seat)
{
- WAYLAND_wl_list_init(&seat->tablet.tool_list);
seat->tablet.wl_tablet_seat = zwp_tablet_manager_v2_get_tablet_seat(seat->display->tablet_manager, seat->wl_seat);
zwp_tablet_seat_v2_add_listener(seat->tablet.wl_tablet_seat, &tablet_seat_listener, seat);
}
@@ -3342,7 +3341,7 @@ static void Wayland_SeatDestroyTablet(SDL_WaylandSeat *seat, bool send_events)
SDL_RemoveAllPenDevices(Wayland_remove_all_pens_callback, NULL);
}
- if (seat && seat->tablet.wl_tablet_seat) {
+ if (seat->tablet.wl_tablet_seat) {
zwp_tablet_seat_v2_destroy(seat->tablet.wl_tablet_seat);
seat->tablet.wl_tablet_seat = NULL;
}
@@ -3362,6 +3361,7 @@ void Wayland_DisplayCreateSeat(SDL_VideoData *display, struct wl_seat *wl_seat,
WAYLAND_wl_list_insert(display->seat_list.prev, &seat->link);
WAYLAND_wl_list_init(&seat->touch.points);
+ WAYLAND_wl_list_init(&seat->tablet.tool_list);
seat->wl_seat = wl_seat;
seat->display = display;
seat->registry_id = id;