From e8204a852dc7bfa93cd1a7e9626adb3ddc3a00ad Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 12 Aug 2019 02:28:49 -0400 Subject: handle_seat_node_destroy: do not focus own node In handle_seat_node_destroy, it was possible to focus the node attached to the seat node that is being destroyed when an empty workspace was being destroyed in a multiple seat environment. This resulted in infinite recursion when attempting to destroy the workspace. This just moves the seat node destruction higher so it cannot be the focus inactive for the seat. This is the same ordering that is applied to destruction of seat nodes for containers --- sway/input/seat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/input/seat.c b/sway/input/seat.c index 12309c1d..f28c1cb9 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -153,6 +153,7 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) { struct sway_node *focus = seat_get_focus(seat); if (node->type == N_WORKSPACE) { + seat_node_destroy(seat_node); // If an unmanaged or layer surface is focused when an output gets // disabled and an empty workspace on the output was focused by the // seat, the seat needs to refocus it's focus inactive to update the @@ -166,7 +167,6 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) { seat->workspace = NULL; } } - seat_node_destroy(seat_node); return; } -- cgit v1.2.3-54-g00ecf