brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/native: Close the input thread in all situations on dispose

Browse Source 
In test situations we sometimes do not create a libinput context, so
our check on dispose to see if we need closing the input thread is off
if META_SEAT_NATIVE_FLAG_NO_LIBINPUT was provided.

Check the input thread existing instead, since that is the thing we
want to undo here.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3153>
This commit is contained in:
Carlos Garnacho 2023-08-05 11:11:58 +02:00
parent c45a64be7a
commit dc527ed510
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backends/native/meta-seat-impl.c
View File

@ -3055,7 +3055,7 @@ destroy_in_impl (GTask *task)
void void
meta_seat_impl_destroy (MetaSeatImpl *seat_impl) meta_seat_impl_destroy (MetaSeatImpl *seat_impl)
{ {
if (seat_impl->libinput) if (seat_impl->input_thread)
{ {
GTask *task; GTask *task;
@ -3065,6 +3065,7 @@ meta_seat_impl_destroy (MetaSeatImpl *seat_impl)
g_object_unref (task); g_object_unref (task);
g_thread_join (seat_impl->input_thread); g_thread_join (seat_impl->input_thread);
seat_impl->input_thread = NULL;
g_assert (!seat_impl->libinput); g_assert (!seat_impl->libinput);
} }