diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2018-11-18 20:11:29 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2018-11-18 20:11:29 +0100 |
| commit | 34cda90a2520c6b2049f5639655edad7c014d9f2 (patch) | |
| tree | 9150bb0b538191d728ac1631879c615d7e8871c0 | |
| parent | 60d3bcfdb3370730babe5e75ae8fbdaae9f09a35 (diff) | |
| parent | 6bdf2eef44b667298aa8f7bd61aa59e59050f588 (diff) | |
Merge branch 'output-directory-for-image-saving' of https://github.com/Ferada/feh into Ferada-output-directory-for-image-saving
| -rw-r--r-- | man/feh.pre | 2 | ||||
| -rw-r--r-- | src/slideshow.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/man/feh.pre b/man/feh.pre index 7ff69cf..f59d082 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -594,7 +594,7 @@ image. . Save files to .Ar directory -.Pq only useful with -k . +.Pq only useful with -k , -o / -O or the save_image command . By default, files are saved in the current working directory. . .It Cm -p , --preload diff --git a/src/slideshow.c b/src/slideshow.c index b404318..19aeaee 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -615,18 +615,21 @@ void slideshow_save_image(winwidget win) { char *tmpname; Imlib_Load_Error err; + char *base_dir = estrjoin("", opt.output_dir ? opt.output_dir : "", "/", NULL); if (win->file) { - tmpname = feh_unique_filename("", FEH_FILE(win->file->data)->name); + tmpname = feh_unique_filename(base_dir, FEH_FILE(win->file->data)->name); } else if (mode) { char *tmp; tmp = estrjoin(".", mode, "png", NULL); - tmpname = feh_unique_filename("", tmp); + tmpname = feh_unique_filename(base_dir, tmp); free(tmp); } else { - tmpname = feh_unique_filename("", "noname.png"); + tmpname = feh_unique_filename(base_dir, "noname.png"); } + free(base_dir); + if (opt.verbose) fprintf(stderr, "saving image to filename '%s'\n", tmpname); |