aboutsummaryrefslogtreecommitdiff
path: root/swaylock/main.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-10-20 01:16:24 +0200
committerGitHub <noreply@github.com>2018-10-20 01:16:24 +0200
commitbb6c9f52c789a7058dbff6a3abb80f8ff5d778ba (patch)
tree62fe7879ad10215d361c3dd5bd4f4bbee230e0c9 /swaylock/main.c
parent0a4735c50cbdb7cc60f8cdf1d0240bda37d63033 (diff)
parentd855837da2e95672b313bbb6c123ce4f58a14460 (diff)
Merge pull request #2884 from c-edw/feature/2867_FixScalingParameter
Prevent overriding background mode after it's been set.
Diffstat (limited to 'swaylock/main.c')
-rw-r--r--swaylock/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/swaylock/main.c b/swaylock/main.c
index 86dfd577..f2bb5c3e 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -385,7 +385,6 @@ static void load_image(char *arg, struct swaylock_state *state) {
return;
}
wl_list_insert(&state->images, &image->link);
- state->args.mode = BACKGROUND_MODE_FILL;
wlr_log(WLR_DEBUG, "Loaded image %s for output %s",
image->path, image->output_name ? image->output_name : "*");
}
@@ -851,7 +850,7 @@ int main(int argc, char **argv) {
enum line_mode line_mode = LM_LINE;
state.args = (struct swaylock_args){
- .mode = BACKGROUND_MODE_SOLID_COLOR,
+ .mode = BACKGROUND_MODE_FILL,
.font = strdup("sans-serif"),
.radius = 50,
.thickness = 10,