logind: Close fd before releasing device

This speeds up shutdown significantly, and is in line with how Weston
does it.
master
Kenny Levinsen 5 years ago committed by Simon Ser
parent ffcf25cc25
commit 904c37845d

@ -107,8 +107,10 @@ static void logind_release_device(struct wlr_session *base, int fd) {
if (fstat(fd, &st) < 0) { if (fstat(fd, &st) < 0) {
wlr_log(WLR_ERROR, "Failed to stat device '%d': %s", fd, wlr_log(WLR_ERROR, "Failed to stat device '%d': %s", fd,
strerror(errno)); strerror(errno));
close(fd);
return; return;
} }
close(fd);
sd_bus_message *msg = NULL; sd_bus_message *msg = NULL;
sd_bus_error error = SD_BUS_ERROR_NULL; sd_bus_error error = SD_BUS_ERROR_NULL;
@ -122,7 +124,6 @@ static void logind_release_device(struct wlr_session *base, int fd) {
sd_bus_error_free(&error); sd_bus_error_free(&error);
sd_bus_message_unref(msg); sd_bus_message_unref(msg);
close(fd);
} }
static bool logind_change_vt(struct wlr_session *base, unsigned vt) { static bool logind_change_vt(struct wlr_session *base, unsigned vt) {

Loading…
Cancel
Save