Bladeren bron

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.

(cherry picked from commit 566448d95a2b3a79ac9418f19d57287ed13f6c00)
Frank Praznik 3 maanden geleden
bovenliggende
commit
4dc440ff71
1 gewijzigde bestanden met toevoegingen van 2 en 7 verwijderingen
  1. 2 7
      src/video/wayland/SDL_waylandvideo.c

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

@@ -1373,17 +1373,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;
         }
     }
 }