2 files changed, 7 insertions, 4 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index fa85d260..329632b6 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -934,7 +934,7 @@ bool output_has_opaque_lockscreen(struct sway_output *output,
                         .x2 = output->swayc->current.swayc_width,
                         .y2 = output->swayc->current.swayc_height,
                 };
-                if (pixman_region32_contains_rectangle(&wlr_surface->current->opaque,
+                if (pixman_region32_contains_rectangle(&wlr_surface->current.opaque,
                                         &output_box)) {
                         return true;
                 }
diff --git a/swaylock/main.c b/swaylock/main.c
index a2a8a36e..1c0cef2b 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -84,8 +84,11 @@ static const struct zwlr_layer_surface_v1_listener layer_surface_listener;
 static cairo_surface_t *select_image(struct swaylock_state *state,
                 struct swaylock_surface *surface);
 
-static bool image_is_opaque(cairo_surface_t *image) {
-        return cairo_surface_get_content(image) == CAIRO_CONTENT_COLOR;
+static bool surface_is_opaque(struct swaylock_surface *surface) {
+        if (surface->image) {
+                return cairo_surface_get_content(surface->image) == CAIRO_CONTENT_COLOR;
+        }
+        return (surface->state->args.color & 0xff) == 0xff;
 }
 
 static void create_layer_surface(struct swaylock_surface *surface) {
@@ -113,7 +116,7 @@ static void create_layer_surface(struct swaylock_surface *surface) {
         zwlr_layer_surface_v1_add_listener(surface->layer_surface,
                         &layer_surface_listener, surface);
 
-        if (image_is_opaque(surface->image) &&
+        if (surface_is_opaque(surface) &&
                         surface->state->args.mode != BACKGROUND_MODE_CENTER &&
                         surface->state->args.mode != BACKGROUND_MODE_FIT) {
                 struct wl_region *region =