Merge pull request #2423 from manio/master

[RFC] Fix segv when sway is terminating
6 years ago · fc039f0759
parent e28101e6e1 3c26536267
commit fc039f0759
1 changed files with 1 additions and 1 deletions
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@ -603,7 +603,7 @@ void view_unmap(struct sway_view *view) {
 	struct sway_container *surviving_ancestor = container_destroy(view->swayc);

 	// 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 ?
 			surviving_ancestor :
 			container_parent(surviving_ancestor, C_WORKSPACE);