aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-08-31 21:34:16 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-08-31 21:39:28 +1000
commitdce549c5378d5d572b8996a7873629df63c45259 (patch)
treebbabf1993a27b2c4a06813b945830384dee9c97f /sway/input
parentde9e80459a93598bdaf6a68485215ce597131d88 (diff)
downloadsway-dce549c5378d5d572b8996a7873629df63c45259.tar.xz
Don't send never-ending transactions when a focused layer surface commits
This moves the arrange_windows call into the arrange_layers function, where we know the output actually needs to be arranged. Additionally, we shouldn't set focus to the parent of an unknown container type, because the parent may be an output and this causes a crash because outputs can't have direct focus. Fixes #2543
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/seat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 36e1d232..5af9e88a 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -779,7 +779,7 @@ void seat_set_focus_layer(struct sway_seat *seat,
wlr_log(WLR_DEBUG, "Returning focus to %p %s '%s'", previous,
container_type_to_str(previous->type), previous->name);
// Hack to get seat to re-focus the return value of get_focus
- seat_set_focus(seat, previous->parent);
+ seat_set_focus(seat, NULL);
seat_set_focus(seat, previous);
}
return;