Merge pull request #132 from taiyu-len/master

fixed segfault on exit + a little fixup of that floatfocus pr

1 files changed, 3 insertions, 1 deletions

diff --git a/sway/layout.c b/sway/layout.c
index cd47037b..ed9479ab 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -151,7 +151,9 @@ swayc_t *remove_child(swayc_t *child) {
 	// Set focused to new container
 	if (parent->focused == child) {
 		if (parent->children->length > 0) {
-			parent->focused = parent->children->items[i?i-1:0];
+			parent->focused = parent->children->items[i ? i-1:0];
+		} else if (parent->floating && parent->floating->length) {
+			parent->focused = parent->floating->items[parent->floating->length - 1];
 		} else {
 			parent->focused = NULL;
 		}