aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/seat.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-02 15:37:56 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-05 18:01:43 +1000
commit4e0452fce3bfc96db6f6f2951794cbb26e75ccd7 (patch)
treedfc9d82c97b051ec1829f918829a1f3c852c5131 /sway/input/seat.c
parentFix output position issue (diff)
downloadsway-4e0452fce3bfc96db6f6f2951794cbb26e75ccd7.tar.gz
sway-4e0452fce3bfc96db6f6f2951794cbb26e75ccd7.tar.zst
sway-4e0452fce3bfc96db6f6f2951794cbb26e75ccd7.zip
Fix scratchpad related crashes
* Was crashing when a view was moved to the scratchpad (prev focus had no parent). * Was crashing when a hidden scratchpad view unmaps because it has no workspace.
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r--sway/input/seat.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 502ed5ac..92d9d7ec 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -618,7 +618,10 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
618 if (last_focus) { 618 if (last_focus) {
619 seat_send_unfocus(last_focus, seat); 619 seat_send_unfocus(last_focus, seat);
620 node_set_dirty(last_focus); 620 node_set_dirty(last_focus);
621 node_set_dirty(node_get_parent(last_focus)); 621 struct sway_node *parent = node_get_parent(last_focus);
622 if (parent) {
623 node_set_dirty(parent);
624 }
622 } 625 }
623 626
624 // Put the container parents on the focus stack, then the workspace, then 627 // Put the container parents on the focus stack, then the workspace, then