sway

commit 4e486a01bb08120b3b02b5fed381a569dea3219e
parent e0e31418d413a16154e7487367a889c629783d1b
Author: emersion <contact@emersion.fr>
Date:   Fri, 13 Jul 2018 23:15:10 +0100

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

swaybar/bg: Fix crash on DPMS off
Diffstat:
M
swaybar/render.c
 | 
3
+++
M
swaybg/main.c
 | 
3
+++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/swaybar/render.c b/swaybar/render.c
@@ -503,6 +503,9 @@ void render_frame(struct swaybar *bar, struct swaybar_output *output) {
 				output->buffers,
 				output->width * output->scale,
 				output->height * output->scale);
+		if (!output->current_buffer) {
+			return;
+		}
 		cairo_t *shm = output->current_buffer->cairo;
 
 		cairo_save(shm);
diff --git a/swaybg/main.c b/swaybg/main.c
@@ -68,6 +68,9 @@ static void render_frame(struct swaybg_state *state) {
 		buffer_height = state->height * state->scale;
 	state->current_buffer = get_next_buffer(state->shm,
 			state->buffers, buffer_width, buffer_height);
+	if (!state->current_buffer) {
+		return;
+	}
 	cairo_t *cairo = state->current_buffer->cairo;
 	if (state->args->mode == BACKGROUND_MODE_SOLID_COLOR) {
 		cairo_set_source_u32(cairo, state->context.color);