Commit 34cda90a authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'output-directory-for-image-saving' of... 

Merge branch 'output-directory-for-image-saving' of https://github.com/Ferada/feh into Ferada-output-directory-for-image-saving
parents 60d3bcfd 6bdf2eef

man/feh.pre

+1 −1
Original line number Diff line number Diff line
@@ -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

src/slideshow.c

+6 −3
Original line number Diff line number Diff line
@@ -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);