Merge pull request #2269 from minus7/swaybarbg-crash-on-dpms-resume

swaybar/bg: Fix crash on DPMS off
This commit is contained in:
emersion 2018-07-13 23:15:10 +01:00 committed by GitHub
commit 4e486a01bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View File

@ -503,6 +503,9 @@ void render_frame(struct swaybar *bar, struct swaybar_output *output) {
output->buffers, output->buffers,
output->width * output->scale, output->width * output->scale,
output->height * output->scale); output->height * output->scale);
if (!output->current_buffer) {
return;
}
cairo_t *shm = output->current_buffer->cairo; cairo_t *shm = output->current_buffer->cairo;
cairo_save(shm); cairo_save(shm);

View File

@ -68,6 +68,9 @@ static void render_frame(struct swaybg_state *state) {
buffer_height = state->height * state->scale; buffer_height = state->height * state->scale;
state->current_buffer = get_next_buffer(state->shm, state->current_buffer = get_next_buffer(state->shm,
state->buffers, buffer_width, buffer_height); state->buffers, buffer_width, buffer_height);
if (!state->current_buffer) {
return;
}
cairo_t *cairo = state->current_buffer->cairo; cairo_t *cairo = state->current_buffer->cairo;
if (state->args->mode == BACKGROUND_MODE_SOLID_COLOR) { if (state->args->mode == BACKGROUND_MODE_SOLID_COLOR) {
cairo_set_source_u32(cairo, state->context.color); cairo_set_source_u32(cairo, state->context.color);