From b793919aba8042fa8c3c43fa71d5f38015a5c121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Fri, 1 Nov 2019 19:59:39 +0100 Subject: [PATCH] wayland: fdm_del() now closes the FD --- wayland.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wayland.c b/wayland.c index bc813f2e..5b2776fd 100644 --- a/wayland.c +++ b/wayland.c @@ -556,11 +556,10 @@ wayl_destroy(struct wayland *wayl) if (wayl == NULL) return; - if (wayl->kbd.repeat.fd != 0) { - fdm_del(wayl->fdm, wayl->kbd.repeat.fd); - close(wayl->kbd.repeat.fd); } + fdm_del(wayl->fdm, wayl->kbd.repeat.fd); + tll_foreach(wayl->monitors, it) { free(it->item.name); if (it->item.xdg != NULL) @@ -628,7 +627,7 @@ wayl_destroy(struct wayland *wayl) if (wayl->registry != NULL) wl_registry_destroy(wayl->registry); if (wayl->display != NULL) { - fdm_del(wayl->fdm, wl_display_get_fd(wayl->display)); + fdm_del_no_close(wayl->fdm, wl_display_get_fd(wayl->display)); wl_display_disconnect(wayl->display); }