aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar dudemanguy <random342@airmail.cc>2018-07-11 10:08:33 -0500
committerLibravatar dudemanguy <random342@airmail.cc>2018-07-11 12:24:06 -0500
commit600c1261509b5849562b7e2238c1363c9950ac35 (patch)
treec0a7dbd2d5c2696175b77eb3bfce19eb3db5c700
parentMerge pull request #2243 from RyanDwyer/use-fullscreen-saved-buffer (diff)
downloadsway-600c1261509b5849562b7e2238c1363c9950ac35.tar.gz
sway-600c1261509b5849562b7e2238c1363c9950ac35.tar.zst
sway-600c1261509b5849562b7e2238c1363c9950ac35.zip
fix crash on floating windows
-rw-r--r--sway/input/seat.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index bf4e8876..be37258f 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -671,7 +671,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
671 // This must happen for both the pending and current children lists. 671 // This must happen for both the pending and current children lists.
672 if (container_is_floating(container)) { 672 if (container_is_floating(container)) {
673 list_move_to_end(container->parent->children, container); 673 list_move_to_end(container->parent->children, container);
674 list_move_to_end(container->parent->current.children, container); 674 if (container_has_ancestor(container, container->current.parent)) {
675 list_move_to_end(container->parent->current.children, container);
676 }
675 } 677 }
676 678
677 // clean up unfocused empty workspace on new output 679 // clean up unfocused empty workspace on new output