aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorBrian Ashworth <RedSoxFan@users.noreply.github.com>2018-09-06 06:30:21 -0400
committerGitHub <noreply@github.com>2018-09-06 06:30:21 -0400
commit6ab38ba098cbdbc88dd0460dcd24b24c2c548d07 (patch)
tree2f94c65cbd7a5d5f3fb4b12e960b8aaeabe32b3b /sway
parentbea9f9c63fe3bd82343a2552f055162422d87d4d (diff)
parent5967ee1fbcba66ea57d971b924a51209a70d3aaa (diff)
Merge pull request #2590 from RyanDwyer/fix-output-active-workspace
Fix crash when switching to new workspace during transaction
Diffstat (limited to 'sway')
-rw-r--r--sway/desktop/render.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index bb3902ec..d72d72bf 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -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)) {