sway

commit fdcf9275b1259deda94723853a60cbaa9cbb522a
parent 8db6c68db640e8535ed71a0369323538f0910d7e
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun, 19 Aug 2018 22:03:57 -0400

Merge pull request #2496 from RyanDwyer/fix-transaction-crash

Fix crash when a view destroys with pending transactions
Diffstat:
M
sway/desktop/transaction.c
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
@@ -175,7 +175,9 @@ static void transaction_apply(struct sway_transaction *transaction) {
 				sizeof(struct sway_container_state));
 
 		if (container->type == C_VIEW && container->sway_view->saved_buffer) {
-			view_remove_saved_buffer(container->sway_view);
+			if (!container->destroying || container->ntxnrefs == 1) {
+				view_remove_saved_buffer(container->sway_view);
+			}
 		}
 
 		// Damage the new location
@@ -283,7 +285,7 @@ static void transaction_commit(struct sway_transaction *transaction) {
 			struct timespec when;
 			wlr_surface_send_frame_done(con->sway_view->surface, &when);
 		}
-		if (con->type == C_VIEW) {
+		if (con->type == C_VIEW && !con->sway_view->saved_buffer) {
 			view_save_buffer(con->sway_view);
 			memcpy(&con->sway_view->saved_geometry, &con->sway_view->geometry,
 					sizeof(struct wlr_box));