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

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

Browse source 
Fix crash when a view destroys with pending transactions
This commit is contained in:
Drew DeVault 2018-08-19 22:03:57 -04:00 committed by GitHub
parent 8db6c68db6 b3e2c49774
commit fdcf9275b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/desktop/transaction.c
View file

@ -175,8 +175,10 @@ static void transaction_apply(struct sway_transaction *transaction) {
sizeof(struct sway_container_state)); sizeof(struct sway_container_state));
if (container->type == C_VIEW && container->sway_view->saved_buffer) { if (container->type == C_VIEW && container->sway_view->saved_buffer) {
if (!container->destroying || container->ntxnrefs == 1) {
view_remove_saved_buffer(container->sway_view); view_remove_saved_buffer(container->sway_view);
} }
}
// Damage the new location // Damage the new location
desktop_damage_whole_container(container); desktop_damage_whole_container(container);
@ -283,7 +285,7 @@ static void transaction_commit(struct sway_transaction *transaction) {
struct timespec when; struct timespec when;
wlr_surface_send_frame_done(con->sway_view->surface, &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); view_save_buffer(con->sway_view);
memcpy(&con->sway_view->saved_geometry, &con->sway_view->geometry, memcpy(&con->sway_view->saved_geometry, &con->sway_view->geometry,
sizeof(struct wlr_box)); sizeof(struct wlr_box));