From 5fab8a2ad4c05fb7bfdbb45915b8abf7ebeab5fe Mon Sep 17 00:00:00 2001
From: minus <minus@mnus.de>
Date: Sat, 9 Mar 2019 11:06:09 +0100
Subject: Fix crash when moving window to scratchpad

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

(limited to 'sway/ipc-json.c')

diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index e9564b04..bebe6dd7 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -354,7 +354,8 @@ static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) {
 	enum sway_container_layout parent_layout = container_parent_layout(c);
 	if ((parent_layout != L_TABBED && parent_layout != L_STACKED &&
 			c->current.border != B_NORMAL) ||
-			c->fullscreen_mode != FULLSCREEN_NONE) {
+			c->fullscreen_mode != FULLSCREEN_NONE ||
+			c->workspace == NULL) {
 		deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0;
 		return;
 	}
-- 
cgit v1.2.3