diff options
| author | Dennis Real <github@tildepipe.org> | 2012-08-28 12:45:57 +0200 |
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2012-08-28 12:45:57 +0200 |
| commit | 0f6d9518b5a12538e4064ef1c397b62e6be61f3b (patch) | |
| tree | 1bb349f1f28cb3be9c8c51569aad862f811c259c /src/filelist.c | |
| parent | 840474a293c3230383afc9e7822ae94a93379f1c (diff) | |
| parent | 25d2a1c0e9c76fa9c37a697147cba2f944ffbb62 (diff) | |
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/filelist.c')
| -rw-r--r-- | src/filelist.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/filelist.c b/src/filelist.c index 34df6cf..920a5ef 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -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) { |