From ddad41f423db14f89f765fc134d45d1ea8a60caf Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sun, 16 Jun 2019 17:36:00 +0200 Subject: Fix sway crashes for scratchpad layouts Currently container_replace removes the container from the scratchpad and re-adds it afterwards. For the split commands this results in the container being send to the scratchpad, which results in a NULL segfault if the same container should be shown. Pass an optional workspace to root_scratchpad_add_container, if the workspace is passed the window will continue to show on the workspace. If NULL is passed it is sent to the scratchpad. This was an issue if no other window except the scratchpad container was on the workspace. Fixes #4240 --- sway/tree/container.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sway/tree/container.c') diff --git a/sway/tree/container.c b/sway/tree/container.c index c4d21f0a..89a47151 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1378,10 +1378,12 @@ void container_replace(struct sway_container *container, struct sway_container *replacement) { enum sway_fullscreen_mode fullscreen = container->fullscreen_mode; bool scratchpad = container->scratchpad; + struct sway_workspace *ws = NULL; if (fullscreen != FULLSCREEN_NONE) { container_fullscreen_disable(container); } if (scratchpad) { + ws = container->workspace; root_scratchpad_show(container); root_scratchpad_remove_container(container); } @@ -1390,7 +1392,7 @@ void container_replace(struct sway_container *container, container_detach(container); } if (scratchpad) { - root_scratchpad_add_container(replacement); + root_scratchpad_add_container(replacement, ws); } switch (fullscreen) { case FULLSCREEN_WORKSPACE: -- cgit v1.2.3-54-g00ecf