diff options
| author |  Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-09-06 06:30:21 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-06 06:30:21 -0400 |
| commit | 6ab38ba098cbdbc88dd0460dcd24b24c2c548d07 (patch) | |
| tree | 2f94c65cbd7a5d5f3fb4b12e960b8aaeabe32b3b | |
| parent | Merge pull request #2578 from RyanDwyer/fix-binding-reload (diff) | |
| parent | Fix crash when switching to new workspace during transaction (diff) | |
| download | sway-6ab38ba098cbdbc88dd0460dcd24b24c2c548d07.tar.gz sway-6ab38ba098cbdbc88dd0460dcd24b24c2c548d07.tar.zst sway-6ab38ba098cbdbc88dd0460dcd24b24c2c548d07.zip | |
Merge pull request #2590 from RyanDwyer/fix-output-active-workspace
Fix crash when switching to new workspace during transaction
| -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, | |||
| 871 | pixman_region32_union_rect(damage, damage, 0, 0, width, height); | 871 | pixman_region32_union_rect(damage, damage, 0, 0, width, height); |
| 872 | } | 872 | } |
| 873 | 873 | ||
| 874 | struct sway_workspace *workspace = output_get_active_workspace(output); | 874 | struct sway_workspace *workspace = output->current.active_workspace; |
| 875 | struct sway_container *fullscreen_con = workspace->current.fullscreen; | 875 | struct sway_container *fullscreen_con = workspace->current.fullscreen; |
| 876 | 876 | ||
| 877 | if (output_has_opaque_overlay_layer_surface(output)) { | 877 | if (output_has_opaque_overlay_layer_surface(output)) { |