Merge pull request #2423 from manio/master

[RFC] Fix segv when sway is terminating
This commit is contained in:
Brian Ashworth 2018-08-08 15:36:17 -04:00 committed by GitHub
commit fc039f0759
Failed to generate hash of commit

View file

@ -603,7 +603,7 @@ void view_unmap(struct sway_view *view) {
struct sway_container *surviving_ancestor = container_destroy(view->swayc); struct sway_container *surviving_ancestor = container_destroy(view->swayc);
// If the workspace wasn't reaped // If the workspace wasn't reaped
if (surviving_ancestor->type >= C_WORKSPACE) { if (surviving_ancestor && surviving_ancestor->type >= C_WORKSPACE) {
struct sway_container *ws = surviving_ancestor->type == C_WORKSPACE ? struct sway_container *ws = surviving_ancestor->type == C_WORKSPACE ?
surviving_ancestor : surviving_ancestor :
container_parent(surviving_ancestor, C_WORKSPACE); container_parent(surviving_ancestor, C_WORKSPACE);