sway

commit 1ef96f7fb770bc6d649e71e94abd1fad798a427f
parent c43374cdf043e913b48d3cdb31d0f716a2cf58bd
Author: Drew DeVault <sir@cmpwn.com>
Date:   Wed, 26 Sep 2018 07:39:13 -0500

Merge pull request #2713 from RyanDwyer/fix-remap-race

Fix race condition crash when view unmaps + maps quickly
Diffstat:
M
sway/tree/container.c
 | 
10
++++------

1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -67,12 +67,10 @@ void container_destroy(struct sway_container *con) {
 	list_free(con->outputs);
 
 	if (con->view) {
-		struct sway_view *view = con->view;
-		view->container = NULL;
-		free(view->title_format);
-		view->title_format = NULL;
-
-		if (view->destroying) {
+		if (con->view->container == con) {
+			con->view->container = NULL;
+		}
+		if (con->view->destroying) {
 			view_destroy(con->view);
 		}
 	}