mirror of
https://github.com/swaywm/sway.git
synced 2024-12-01 19:06:38 +00:00
Merge pull request #2496 from RyanDwyer/fix-transaction-crash
Fix crash when a view destroys with pending transactions
This commit is contained in:
commit
fdcf9275b1
|
@ -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));
|
||||||
|
|
Loading…
Reference in a new issue