From 13a67da614449ec95d1dc1927ed7dca6a1c54fb7 Mon Sep 17 00:00:00 2001 From: mwenzkowski <29407878+mwenzkowski@users.noreply.github.com> Date: Sat, 24 Oct 2020 17:27:38 +0200 Subject: [PATCH] container: Fix NULL pointer dereference Reset the workspace layout to the output's default only if the workspace is actually attached to an output. Fixes #5762 --- sway/tree/container.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sway/tree/container.c b/sway/tree/container.c index fe622c7b..3e234186 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1358,7 +1358,9 @@ void container_detach(struct sway_container *child) { // We may have removed the last tiling child from the workspace. If the // workspace layout was e.g. tabbed, then at this point it may be just // H[]. So, reset it to the default (e.g. T[]) for next time. - if (!old_workspace->tiling->length) { + // But if we are evacuating a workspace with only sticky floating + // containers, the workspace will already be detached from the output. + if (old_workspace->output && !old_workspace->tiling->length) { old_workspace->layout = output_get_default_layout(old_workspace->output); }