Merge branch 'terminate-on-event-loop-destroy' into 'main'

server: fix abort when terminating display on wl_event_loop destroy

See merge request wayland/wayland!421
This commit is contained in:
Simon Ser 2026-03-20 22:42:18 +00:00
commit bca53da52a
2 changed files with 31 additions and 1 deletions

View file

@ -1313,11 +1313,12 @@ wl_display_destroy(struct wl_display *display)
wl_socket_destroy(s);
}
close(display->terminate_efd);
wl_event_source_remove(display->term_source);
wl_event_loop_destroy(display->loop);
close(display->terminate_efd);
wl_list_for_each_safe(global, gnext, &display->global_list, link)
free(global);