sway

commit 057635f1a32034ffc07faa92a1228b8b6454e6fa
parent fa4308c5abecaeef870aced574e9d05e24e62392
Author: Ryan Dwyer <RyanDwyer@users.noreply.github.com>
Date:   Fri, 21 Sep 2018 20:15:27 +1000

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

Fix segfault in output_render
Diffstat:
M
sway/desktop/render.c
 | 
11
+++++++----

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
@@ -914,12 +914,17 @@ void output_render(struct sway_output *output, struct timespec *when,
 	struct wlr_output *wlr_output = output->wlr_output;
 
 	struct wlr_renderer *renderer =
-	wlr_backend_get_renderer(wlr_output->backend);
+		wlr_backend_get_renderer(wlr_output->backend);
 	if (!sway_assert(renderer != NULL,
 			"expected the output backend to have a renderer")) {
 		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};