aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-01 18:59:39 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-01 18:59:39 +0000
commitb793919aba8042fa8c3c43fa71d5f38015a5c121 (patch)
treeffb130ad265bf9ecfed99ed434a590b506034699
parentfdm: don't free FD data that may be referenced by epoll return data (diff)
wayland: fdm_del() now closes the FD
-rw-r--r--wayland.c7
1 files 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);
}