diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-05 16:39:20 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-05 16:39:20 +1000 |
| commit | 44b550298ed64043d54b40f98d627908d37a37d2 (patch) | |
| tree | 957b38e10118ca079748b12ab64cd88048242f64 | |
| parent | c8d1f376d35132ba119e1f02b6640484c55a34c7 (diff) | |
| download | sway-44b550298ed64043d54b40f98d627908d37a37d2.tar.xz | |
Fix crash when flattening container after moving
container_flatten removes the container from the tree (via
container_replace) before destroying it. When destroying, the recent
changes to handle_seat_node_destroy incorrectly assumes that the
container has a parent.
This adds a check for destroying a container which is no longer in the
tree. If this is the case, focus does not need to be changed.
| -rw-r--r-- | sway/input/seat.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 415f85ac..675edb2d 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -157,6 +157,11 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) { seat_node_destroy(seat_node); + if (!parent) { + // Destroying a container that is no longer in the tree + return; + } + // Find new focus_inactive (ie. sibling, or workspace if no siblings left) struct sway_node *next_focus = NULL; while (next_focus == NULL) { |