commit b491b9ea985dcf7f378e16223fdc3fac6a0d1f30
parent c0367e1449084f28ab874456c8e650f0724e050f
Author: Cassandra Fox <cass@fox.mom>
Date: Fri, 31 May 2019 12:32:37 -0700
Merge pull request #122 from mortie/i3lock-color
Fix a merge issue and a brain fart
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/i3lock.c b/i3lock.c
@@ -270,7 +270,7 @@ bool bar_reversed = false;
int is_directory(const char *path) {
struct stat path_stat;
stat(path, &path_stat);
- return !S_ISDIR(path_stat.st_mode);
+ return S_ISDIR(path_stat.st_mode);
}
/*
@@ -2130,7 +2130,7 @@ int main(int argc, char *argv[]) {
init_colors_once();
if (image_path != NULL) {
if (!is_directory(image_path)) {
- img = load_image(image_path);
+ img = load_image(image_path, image_raw_format);
} else {
/* Path to a directory is provided -> use slideshow mode */
load_slideshow_images(image_path, image_raw_format);