Commit dfe65efc authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

fix --filelist trying to load .txt and similar with magick. (closes #96)

parent 22485fb7

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ git HEAD 
    * Always use file URL as filename when opening http files.

      (consequence: lossless rotate no longer works for such files)

    * --reload now accepts rational numbers

    * Fix --filelist trying to load .txt files with imagemagick



Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>

src/filelist.c

+4 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ gib_list *feh_read_filelist(char *filename) 
	char s[1024], s1[1024];

	Imlib_Image tmp_im;

	struct stat st;

	signed short tmp_magick_timeout;



	if (!filename)

		return(NULL);
@@ -463,6 +464,8 @@ gib_list *feh_read_filelist(char *filename) 
	/*

	 * feh_load_image will fail horribly if filename is not seekable

	 */

	tmp_magick_timeout = opt.magick_timeout;

	opt.magick_timeout = -1;

	if (!stat(filename, &st) && S_ISREG(st.st_mode) &&

			feh_load_image_char(&tmp_im, filename)) {

		weprintf("Filelist file %s is an image, refusing to use it.\n"
@@ -470,6 +473,7 @@ gib_list *feh_read_filelist(char *filename) 
		opt.filelistfile = NULL;

		return NULL;

	}

	opt.magick_timeout = tmp_magick_timeout;



	errno = 0;

	if ((fp = fopen(filename, "r")) == NULL) {