aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop/render.c
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-07-23 17:47:40 +0100
committerGitHub <noreply@github.com>2018-07-23 17:47:40 +0100
commit5a77bc321553f5137f9f9ce49622ba3860801494 (patch)
tree882ee99233260600f53fa9334748f0db8c55ef72 /sway/desktop/render.c
parent0515b37dfde41cfa85529ac0f8b991a1bec749d2 (diff)
parent7ead2e85a7816a65e87bb7fded7414f571d56619 (diff)
Merge pull request #2338 from somdoron/master
fix crash on new output while swaylock is running
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r--sway/desktop/render.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 4c85e516..7da54594 100644
--- 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);