mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-08 09:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle_seat_node_destroy: do not focus own node

Browse source 
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
This commit is contained in:
Brian Ashworth 2019-08-12 02:28:49 -04:00 committed by Drew DeVault
parent d9c09c483a
commit e8204a852d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/input/seat.c
View file

@ -153,6 +153,7 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
struct sway_node *focus = seat_get_focus(seat); struct sway_node *focus = seat_get_focus(seat);
if (node->type == N_WORKSPACE) { if (node->type == N_WORKSPACE) {
seat_node_destroy(seat_node);
// If an unmanaged or layer surface is focused when an output gets // If an unmanaged or layer surface is focused when an output gets
// disabled and an empty workspace on the output was focused by the // 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 // 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->workspace = NULL;
} }
} }
seat_node_destroy(seat_node);
return; return;
} }