aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-06-23 17:47:28 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-06-23 17:47:28 +1000
commit32b865e610dd937af17ce36b8c986e41f55a4627 (patch)
treebb89819988dcebe0d621c645fac35c9bfe4198d4 /sway/input
parentb11c9199a61775d7ed441c68238e11e93fbd6d21 (diff)
downloadsway-32b865e610dd937af17ce36b8c986e41f55a4627.tar.xz
Fix crash when deleting last child in a tabbed or stacked container
There was no `current` child because the container was destroyed. This makes it fall back to looking in the parent's current children list.
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/seat.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 1ea36466..436d18e2 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -829,6 +829,18 @@ struct sway_container *seat_get_active_child(struct sway_seat *seat,
return NULL;
}
+struct sway_container *seat_get_active_current_child(struct sway_seat *seat,
+ struct sway_container *container) {
+ struct sway_container *child = seat_get_active_child(seat, container);
+ if (child) {
+ return child;
+ }
+ if (container->current.children->length == 1) {
+ return container->current.children->items[0];
+ }
+ return NULL;
+}
+
struct sway_container *seat_get_focus(struct sway_seat *seat) {
if (!seat->has_focus) {
return NULL;