alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2414 from RyanDwyer/fix-inactive-fullscreen-crash

Browse source 
Fix crash when fullscreen view closes on inactive workspace
This commit is contained in:
emersion 2018-08-03 09:56:46 +01:00 committed by GitHub
parent 16c1e21f26 854c5fbec8
commit b49904dd7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sway/tree/view.c
View file

@ -592,19 +592,18 @@ void view_unmap(struct sway_view *view) {
view->urgent_timer = NULL; view->urgent_timer = NULL;
} }
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); bool was_fullscreen = view->swayc->is_fullscreen;
struct sway_container *surviving_ancestor = container_destroy(view->swayc);
struct sway_container *parent; // If the workspace wasn't reaped
if (container_is_fullscreen_or_child(view->swayc)) { if (surviving_ancestor->type >= C_WORKSPACE) {
parent = container_destroy(view->swayc); struct sway_container *ws = surviving_ancestor->type == C_WORKSPACE ?
arrange_windows(ws->parent); surviving_ancestor :
} else { container_parent(surviving_ancestor, C_WORKSPACE);
parent = container_destroy(view->swayc); arrange_windows(was_fullscreen ? ws : surviving_ancestor);
arrange_windows(parent);
}
if (parent->type >= C_WORKSPACE) { // if the workspace still exists
workspace_detect_urgent(ws); workspace_detect_urgent(ws);
} }
transaction_commit_dirty(); transaction_commit_dirty();
view->surface = NULL; view->surface = NULL;
} }