Merge pull request #2590 from RyanDwyer/fix-output-active-workspace

Fix crash when switching to new workspace during transaction
This commit is contained in:
Brian Ashworth 2018-09-06 06:30:21 -04:00 committed by GitHub
commit 6ab38ba098
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -871,7 +871,7 @@ void output_render(struct sway_output *output, struct timespec *when,
pixman_region32_union_rect(damage, damage, 0, 0, width, height);
}
struct sway_workspace *workspace = output_get_active_workspace(output);
struct sway_workspace *workspace = output->current.active_workspace;
struct sway_container *fullscreen_con = workspace->current.fullscreen;
if (output_has_opaque_overlay_layer_surface(output)) {