sway

commit 5a77bc321553f5137f9f9ce49622ba3860801494
parent 0515b37dfde41cfa85529ac0f8b991a1bec749d2
Author: emersion <contact@emersion.fr>
Date:   Mon, 23 Jul 2018 17:47:40 +0100

Merge pull request #2338 from somdoron/master

fix crash on new output while swaylock is running
Diffstat:
M
sway/desktop/render.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
@@ -838,7 +838,7 @@ void output_render(struct sway_output *output, struct timespec *when,
 	struct sway_view *fullscreen_view = workspace->current.ws_fullscreen;
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
 
-	if (output_has_opaque_lockscreen(output, seat)) {
+	if (output_has_opaque_lockscreen(output, seat) && seat->focused_layer) {
 		struct wlr_layer_surface *wlr_layer_surface = seat->focused_layer;
 		struct sway_layer_surface *sway_layer_surface =
 			layer_from_wlr_layer_surface(seat->focused_layer);