mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

container: Fix NULL pointer dereference

Browse source 
Reset the workspace layout to the output's default only if the workspace
is actually attached to an output.

Fixes #5762
This commit is contained in:
mwenzkowski 2020-10-24 17:27:38 +02:00 committed by Brian Ashworth
parent d06c1ac1e9
commit 13a67da614
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/tree/container.c
View file

@ -1358,7 +1358,9 @@ void container_detach(struct sway_container *child) {
// We may have removed the last tiling child from the workspace. If the // 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 // 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. // 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 = old_workspace->layout =
output_get_default_layout(old_workspace->output); output_get_default_layout(old_workspace->output);
} }