diff options
author | emersion <contact@emersion.fr> | 2018-10-05 09:40:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-05 09:40:05 +0200 |
commit | c1f09939ae4b5c0554b9f78921e02b2f9550c4e5 (patch) | |
tree | 957b38e10118ca079748b12ab64cd88048242f64 | |
parent | Merge pull request #2764 from ianyfan/rm-base64 (diff) | |
parent | Fix crash when flattening container after moving (diff) | |
download | sway-c1f09939ae4b5c0554b9f78921e02b2f9550c4e5.tar.gz sway-c1f09939ae4b5c0554b9f78921e02b2f9550c4e5.tar.zst sway-c1f09939ae4b5c0554b9f78921e02b2f9550c4e5.zip |
Merge pull request #2768 from RyanDwyer/fix-flatten-crash
Fix crash when flattening container after moving
-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) { | |||
157 | 157 | ||
158 | seat_node_destroy(seat_node); | 158 | seat_node_destroy(seat_node); |
159 | 159 | ||
160 | if (!parent) { | ||
161 | // Destroying a container that is no longer in the tree | ||
162 | return; | ||
163 | } | ||
164 | |||
160 | // Find new focus_inactive (ie. sibling, or workspace if no siblings left) | 165 | // Find new focus_inactive (ie. sibling, or workspace if no siblings left) |
161 | struct sway_node *next_focus = NULL; | 166 | struct sway_node *next_focus = NULL; |
162 | while (next_focus == NULL) { | 167 | while (next_focus == NULL) { |