aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-07-11 15:26:47 -0700
committerGitHub <noreply@github.com>2018-07-11 15:26:47 -0700
commit2bc18d8cf77c2a4aa47453c4177fdaac29736db8 (patch)
treefc03964ad296f3e0d7d9bf54e004808a9f9200e2 /sway
parent588abbb128c17430b8af1a26b4a3f01bbd5852e5 (diff)
parent600c1261509b5849562b7e2238c1363c9950ac35 (diff)
Merge pull request #2248 from Dudemanguy911/fix_crash_on_floating_windows
fix crash on floating windows
Diffstat (limited to 'sway')
-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,
// This must happen for both the pending and current children lists.
if (container_is_floating(container)) {
list_move_to_end(container->parent->children, container);
- list_move_to_end(container->parent->current.children, container);
+ if (container_has_ancestor(container, container->current.parent)) {
+ list_move_to_end(container->parent->current.children, container);
+ }
}
// clean up unfocused empty workspace on new output