From 9b9d968cbfb04c190f86790376ea9be5f391ac49 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Tue, 1 Dec 2015 18:09:37 -0500
Subject: Fix for_window [...] move scratchpad correctly

---
 sway/focus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sway/focus.c b/sway/focus.c
index 7af858a1..9f070866 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -15,6 +15,7 @@ bool locked_view_focus = false;
 static void update_focus(swayc_t *c) {
 	// Handle if focus switches
 	swayc_t *parent = c->parent;
+	if (!parent) return;
 	if (parent->focused != c) {
 		// Get previous focus
 		swayc_t *prev = parent->focused;
@@ -87,7 +88,7 @@ swayc_t *get_focused_container(swayc_t *parent) {
 }
 
 bool set_focused_container(swayc_t *c) {
-	if (locked_container_focus || !c) {
+	if (locked_container_focus || !c || !c->parent) {
 		return false;
 	}
 	swayc_log(L_DEBUG, c, "Setting focus to %p:%ld", c, c->handle);
-- 
cgit v1.2.3