pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swaylock: Log error if multiple images are defined for the same output

Browse Source
This commit is contained in:
Ryan Dwyer 2018-05-20 22:39:08 +10:00
parent 3afd535a3b
commit 9a06de63e7
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main.c
View File

@ -223,6 +223,23 @@ static void load_image(char *arg, struct swaylock_state *state) {
image->path = strdup(arg); image->path = strdup(arg);
} }
bool exists = false;
struct swaylock_image *iter_image;
wl_list_for_each(iter_image, &state->images, link) {
if (lenient_strcmp(iter_image->output_name, image->output_name) == 0) {
exists = true;
break;
}
}
if (exists) {
if (image->output_name) {
wlr_log(L_ERROR, "Multiple images defined for output %s",
image->output_name);
} else {
wlr_log(L_ERROR, "Multiple default images defined");
}
}
// Bash doesn't replace the ~ with $HOME if the output name is supplied // Bash doesn't replace the ~ with $HOME if the output name is supplied
wordexp_t p; wordexp_t p;
if (wordexp(image->path, &p, 0) == 0) { if (wordexp(image->path, &p, 0) == 0) {