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

Fix crash in workspace_wrap_children

Browse Source 
When workspace_wrap_children is called on a workspace which has a
fullscreen child and the fullscreen child is a direct child of the
workspace, sway would crash.

The workspace's fullscreen pointer is unset when the fullscreen
container is detached and applied again when added to a parent, but in
this case the parent hadn't yet been added to the workspace which meant
con->workspace was NULL.

The fix makes container_handle_fullscreen_reparent return if there's no
workspace, and the fullscreen pointer is reapplied in
workspace_wrap_children.
This commit is contained in:
Ryan Dwyer 2018-09-11 23:38:17 +10:00
parent 403905c11b
commit df95c61044
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sway/tree/container.c
View File

@ -1063,7 +1063,8 @@ list_t *container_get_current_siblings(struct sway_container *container) {
} }
void container_handle_fullscreen_reparent(struct sway_container *con) { void container_handle_fullscreen_reparent(struct sway_container *con) {
if (!con->is_fullscreen || con->workspace->fullscreen == con) { if (!con->is_fullscreen || !con->workspace ||
con->workspace->fullscreen == con) {
return; return;
} }
if (con->workspace->fullscreen) { if (con->workspace->fullscreen) {

2
sway/tree/workspace.c
View File

@ -557,6 +557,7 @@ struct sway_container *workspace_find_container(struct sway_workspace *ws,
} }
struct sway_container *workspace_wrap_children(struct sway_workspace *ws) { struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
struct sway_container *fs = ws->fullscreen;
struct sway_container *middle = container_create(NULL); struct sway_container *middle = container_create(NULL);
middle->layout = ws->layout; middle->layout = ws->layout;
while (ws->tiling->length) { while (ws->tiling->length) {
@ -565,6 +566,7 @@ struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
container_add_child(middle, child); container_add_child(middle, child);
} }
workspace_add_tiling(ws, middle); workspace_add_tiling(ws, middle);
ws->fullscreen = fs;
return middle; return middle;
} }