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/imlib.c | |
| parent | 840474a293c3230383afc9e7822ae94a93379f1c (diff) | |
| parent | 25d2a1c0e9c76fa9c37a697147cba2f944ffbb62 (diff) | |
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/imlib.c')
| -rw-r--r-- | src/imlib.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/imlib.c b/src/imlib.c index e7dcaeb..af7acdd 100644 --- a/src/imlib.c +++ b/src/imlib.c @@ -171,14 +171,7 @@ int feh_load_image(Imlib_Image * im, feh_file * file) file->ed = exif_get_data(tmpname); #endif } - if ((opt.slideshow) && (opt.reload == 0) && (image_source != SRC_MAGICK)) { - free(file->filename); - file->filename = estrdup(tmpname); - - if (!opt.keep_http) - add_file_to_rm_filelist(tmpname); - } - else if ((image_source == SRC_MAGICK) || !opt.keep_http) + if ((image_source == SRC_MAGICK) || !opt.keep_http) unlink(tmpname); free(tmpname); |