diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-06 20:20:29 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-06 20:20:29 +1000 |
| commit | 5967ee1fbcba66ea57d971b924a51209a70d3aaa (patch) | |
| tree | 2f94c65cbd7a5d5f3fb4b12e960b8aaeabe32b3b /sway/desktop | |
| parent | bea9f9c63fe3bd82343a2552f055162422d87d4d (diff) | |
Fix crash when switching to new workspace during transaction
When rendering, the workspace for the output needs to be retrieved from
the output's `current` state. output_get_active_workspace returns the
pending workspace, which crashes if the pending workspace is new and
hasn't completed a transaction yet.
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/render.c | 2 |
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)) { |