Browse Source

wayland: Eliminate redundant keyboard and mouse removals

The SDL keyboard and mouse will be removed when destroying the seat, so there is no need to preemptively remove them.
Frank Praznik 4 days ago
parent
commit
566448d95a
1 changed files with 2 additions and 7 deletions
  1. 2 7
      src/video/wayland/SDL_waylandvideo.c

+ 2 - 7
src/video/wayland/SDL_waylandvideo.c

@@ -1452,17 +1452,12 @@ static void handle_registry_remove_global(void *data, struct wl_registry *regist
         }
     }
 
-    struct SDL_WaylandSeat *seat, *temp;
+    SDL_WaylandSeat *seat, *temp;
     wl_list_for_each_safe (seat, temp, &d->seat_list, link)
     {
         if (seat->registry_id == id) {
-            if (seat->keyboard.wl_keyboard) {
-                SDL_RemoveKeyboard(seat->keyboard.sdl_id);
-            }
-            if (seat->pointer.wl_pointer) {
-                SDL_RemoveMouse(seat->pointer.sdl_id);
-            }
             Wayland_SeatDestroy(seat, false);
+            return;
         }
     }
 }