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

Fix crash when a deferred command destroys a workspace

Browse source 
Example config that produces the crash (with a single output):

    workspace 1
    workspace 2

Prior to this commit, container_workspace_free would manually mark the
L_FLOATING container as destroying and free it. This assumed the
L_FLOATING container would never be involved in a transaction. This was
a safe assumption when it was implemented, but became an incorrect
assumption once parent/child relationships became transactionised.

This commit removes the L_FLOATING free from container_workspace_free.
When the workspace is destroyed, it starts the normal destroy process on
the L_FLOATING container so it can be freed via transactions.
This commit is contained in:
Ryan Dwyer 2018-07-28 22:13:13 +10:00
parent a2164c6661
commit 84cd22c8cb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/tree/container.c
View file

@ -142,8 +142,6 @@ struct sway_container *container_create(enum sway_container_type type) {
static void container_workspace_free(struct sway_workspace *ws) { static void container_workspace_free(struct sway_workspace *ws) {
list_foreach(ws->output_priority, free); list_foreach(ws->output_priority, free);
list_free(ws->output_priority); list_free(ws->output_priority);
ws->floating->destroying = true;
container_free(ws->floating);
free(ws); free(ws);
} }
@ -196,6 +194,9 @@ void container_free(struct sway_container *cont) {
free(cont); free(cont);
} }
static struct sway_container *container_destroy_noreaping(
struct sway_container *con);
static struct sway_container *container_workspace_destroy( static struct sway_container *container_workspace_destroy(
struct sway_container *workspace) { struct sway_container *workspace) {
if (!sway_assert(workspace, "cannot destroy null workspace")) { if (!sway_assert(workspace, "cannot destroy null workspace")) {
@ -240,6 +241,8 @@ static struct sway_container *container_workspace_destroy(
} }
} }
container_destroy_noreaping(workspace->sway_workspace->floating);
return output; return output;
} }