Merge pull request #2338 from somdoron/master

fix crash on new output while swaylock is running
This commit is contained in:
emersion 2018-07-23 17:47:40 +01:00 committed by GitHub
commit 5a77bc3215
Failed to generate hash of commit

View file

@ -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);