mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-01 19:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when a view destroys with pending transactions

Browse source 
We were removing the saved buffer when one transaction applies, then
didn't have a new buffer to save when the next transaction ran. This
made the rendering code crash as it had no surface to use.

This commit makes it continue to hold the buffer if the view is
destroying and has more transactions. Additionally, a check is added
when saving the buffer to make sure there's no one already there.
This commit is contained in:
Ryan Dwyer 2018-08-20 08:54:58 +10:00
parent 8db6c68db6
commit b3e2c49774
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));