aboutsummaryrefslogtreecommitdiffstats
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
authorLibravatar minus <minus@mnus.de>2019-03-09 11:06:09 +0100
committerLibravatar emersion <contact@emersion.fr>2019-03-09 11:21:41 +0100
commit5fab8a2ad4c05fb7bfdbb45915b8abf7ebeab5fe (patch)
treee5cd5ad4270ab12fbd148b0fe86aff4ab99a929b /sway/ipc-json.c
parentAdd missing swaymsg completions (diff)
downloadsway-5fab8a2ad4c05fb7bfdbb45915b8abf7ebeab5fe.tar.gz
sway-5fab8a2ad4c05fb7bfdbb45915b8abf7ebeab5fe.tar.zst
sway-5fab8a2ad4c05fb7bfdbb45915b8abf7ebeab5fe.zip
Fix crash when moving window to scratchpad
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c3
1 files changed, 2 insertions, 1 deletions
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) {
354 enum sway_container_layout parent_layout = container_parent_layout(c); 354 enum sway_container_layout parent_layout = container_parent_layout(c);
355 if ((parent_layout != L_TABBED && parent_layout != L_STACKED && 355 if ((parent_layout != L_TABBED && parent_layout != L_STACKED &&
356 c->current.border != B_NORMAL) || 356 c->current.border != B_NORMAL) ||
357 c->fullscreen_mode != FULLSCREEN_NONE) { 357 c->fullscreen_mode != FULLSCREEN_NONE ||
358 c->workspace == NULL) {
358 deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0; 359 deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0;
359 return; 360 return;
360 } 361 }