From db36f0dfe863e2fe20bcb4e8ef4ba06579ab2e53 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Tue, 4 Aug 2020 01:43:24 +0200 Subject: client: Sanitize shutdown/kill mechanism --- seatd/seat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'seatd/seat.c') diff --git a/seatd/seat.c b/seatd/seat.c index 8650e2b..37f2b00 100644 --- a/seatd/seat.c +++ b/seatd/seat.c @@ -40,7 +40,7 @@ void seat_destroy(struct seat *seat) { while (!linked_list_empty(&seat->clients)) { struct client *client = (struct client *)seat->clients.next; // This will cause the client to remove itself from the seat - assert(client->seat); + assert(client->seat == seat); client_kill(client); } assert(seat->curttyfd == -1); @@ -367,7 +367,7 @@ int seat_open_client(struct seat *seat, struct client *client) { seat->active_client = client; if (client_send_enable_seat(client) == -1) { - seat_remove_client(client); + log_error("could not send enable signal"); return -1; } @@ -428,7 +428,7 @@ static int seat_disable_client(struct client *client) { client->pending_disable = true; if (client_send_disable_seat(seat->active_client) == -1) { - seat_remove_client(client); + log_error("could not send disable event"); return -1; } -- cgit v1.2.3