mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: refactor server_finish()

Browse source
This commit is contained in:
Johan Malm 2020-10-22 19:54:30 +01:00
parent d39b158cec
commit 109d942534
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/seat.c
View file

@ -111,7 +111,6 @@ seat_finish(struct server *server)
}
wlr_xcursor_manager_destroy(seat->xcursor_manager);
wlr_cursor_destroy(seat->cursor);
wlr_seat_destroy(server->seat.seat);
}
void

19
src/server.c
View file

@ -206,15 +206,20 @@ server_start(struct server *server)
void
server_finish(struct server *server)
{
struct output *o, *o_tmp;
wl_list_for_each_safe (o, o_tmp, &server->outputs, link) {
wl_list_remove(&o->link);
free(o);
}
wlr_output_layout_destroy(server->output_layout);
seat_finish(server);
wlr_xwayland_destroy(server->xwayland);
wl_event_source_remove(sighup_source);
wl_display_destroy_clients(server->wl_display);
seat_finish(server);
wl_display_destroy(server->wl_display);
struct output *output, *next;
wl_list_for_each_safe (output, next, &server->outputs, link) {
info("remove output %p", output);
wl_list_remove(&output->link);
free(output);
}
wlr_output_layout_destroy(server->output_layout);
}