wayland/seat: Don't double-disable input classes

We'd set the capabilities to 'none', meaning all previously enabled
device classes would be disabled. That means we shouldn't re-disable
them directly after.

This ensures '..disable()' is only called once for every '..enable()'.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2657>
This commit is contained in:
Jonas Ådahl 2022-10-13 11:56:06 +02:00 committed by Marge Bot
parent 7e7a639cc5
commit ed8275ec33

View File

@ -255,11 +255,8 @@ meta_wayland_seat_free (MetaWaylandSeat *seat)
g_signal_handlers_disconnect_by_data (clutter_seat, seat); g_signal_handlers_disconnect_by_data (clutter_seat, seat);
meta_wayland_seat_set_capabilities (seat, 0); meta_wayland_seat_set_capabilities (seat, 0);
meta_wayland_pointer_disable (seat->pointer);
g_object_unref (seat->pointer); g_object_unref (seat->pointer);
meta_wayland_keyboard_disable (seat->keyboard);
g_object_unref (seat->keyboard); g_object_unref (seat->keyboard);
meta_wayland_touch_disable (seat->touch);
g_object_unref (seat->touch); g_object_unref (seat->touch);
meta_wayland_text_input_destroy (seat->text_input); meta_wayland_text_input_destroy (seat->text_input);