diff options
| author |  emersion <contact@emersion.fr> | 2018-07-23 17:47:40 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-23 17:47:40 +0100 |
| commit | 5a77bc321553f5137f9f9ce49622ba3860801494 (patch) | |
| tree | 882ee99233260600f53fa9334748f0db8c55ef72 | |
| parent | Merge pull request #2323 from RyanDwyer/scratchpad (diff) | |
| parent | fix crash on new output while swaylock is running (diff) | |
| download | sway-5a77bc321553f5137f9f9ce49622ba3860801494.tar.gz sway-5a77bc321553f5137f9f9ce49622ba3860801494.tar.zst sway-5a77bc321553f5137f9f9ce49622ba3860801494.zip | |
Merge pull request #2338 from somdoron/master
fix crash on new output while swaylock is running
| -rw-r--r-- | sway/desktop/render.c | 2 |
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, | |||
| 838 | struct sway_view *fullscreen_view = workspace->current.ws_fullscreen; | 838 | struct sway_view *fullscreen_view = workspace->current.ws_fullscreen; |
| 839 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 839 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
| 840 | 840 | ||
| 841 | if (output_has_opaque_lockscreen(output, seat)) { | 841 | if (output_has_opaque_lockscreen(output, seat) && seat->focused_layer) { |
| 842 | struct wlr_layer_surface *wlr_layer_surface = seat->focused_layer; | 842 | struct wlr_layer_surface *wlr_layer_surface = seat->focused_layer; |
| 843 | struct sway_layer_surface *sway_layer_surface = | 843 | struct sway_layer_surface *sway_layer_surface = |
| 844 | layer_from_wlr_layer_surface(seat->focused_layer); | 844 | layer_from_wlr_layer_surface(seat->focused_layer); |