mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-07-02 17:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2665 from emersion/render-output-segfault

Browse source 
Fix segfault in output_render
This commit is contained in:
Ryan Dwyer 2018-09-21 20:15:27 +10:00 committed by GitHub
parent fa4308c5ab 0798fadff2
commit 057635f1a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/desktop/render.c
View file

@ -920,6 +920,11 @@ void output_render(struct sway_output *output, struct timespec *when,
return;
}
struct sway_workspace *workspace = output->current.active_workspace;
if (workspace == NULL) {
return;
}
wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
if (!pixman_region32_not_empty(damage)) {
@ -935,13 +940,11 @@ 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->current.active_workspace;
struct sway_container *fullscreen_con = workspace->current.fullscreen;
if (output_has_opaque_overlay_layer_surface(output)) {
goto render_overlay;
}
struct sway_container *fullscreen_con = workspace->current.fullscreen;
if (fullscreen_con) {
float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};