diff options
author | emersion <contact@emersion.fr> | 2018-05-23 22:54:52 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-05-23 22:54:52 +0100 |
commit | cd0fca2ebf81c252b3743c4474a5fdbcd3e2afad (patch) | |
tree | 595f1e80551b64de0d4e24f5721bae27acc195d9 /swaylock/render.c | |
parent | Fix output hotplugging (diff) | |
parent | Merge pull request #2022 from RedSoxFan/ipc-get-marks (diff) | |
download | sway-cd0fca2ebf81c252b3743c4474a5fdbcd3e2afad.tar.gz sway-cd0fca2ebf81c252b3743c4474a5fdbcd3e2afad.tar.zst sway-cd0fca2ebf81c252b3743c4474a5fdbcd3e2afad.zip |
Merge branch 'master' into fix-swaylock-hotplugging
Diffstat (limited to 'swaylock/render.c')
-rw-r--r-- | swaylock/render.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swaylock/render.c b/swaylock/render.c index 7d9d25a5..cc40f4e9 100644 --- a/swaylock/render.c +++ b/swaylock/render.c | |||
@@ -23,7 +23,7 @@ void render_frame(struct swaylock_surface *surface) { | |||
23 | cairo_t *cairo = surface->current_buffer->cairo; | 23 | cairo_t *cairo = surface->current_buffer->cairo; |
24 | cairo_identity_matrix(cairo); | 24 | cairo_identity_matrix(cairo); |
25 | 25 | ||
26 | if (state->args.mode == BACKGROUND_MODE_SOLID_COLOR) { | 26 | if (state->args.mode == BACKGROUND_MODE_SOLID_COLOR || !surface->image) { |
27 | cairo_set_source_u32(cairo, state->args.color); | 27 | cairo_set_source_u32(cairo, state->args.color); |
28 | cairo_paint(cairo); | 28 | cairo_paint(cairo); |
29 | } else { | 29 | } else { |