summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-03-03 23:54:56 +0100
committerDaniel Friesel <derf@finalrewind.org>2012-03-03 23:54:56 +0100
commit6aace46e3cf7c13b41bdcb0804939ecc1cb32a2d (patch)
tree124ac746640ce184e9836d076771e65397bb8535 /src
parentba08d4b25fcbcd4e16388673184cf4d179dbd420 (diff)
magick: use correct filename
Diffstat (limited to 'src')
-rw-r--r--src/imlib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imlib.c b/src/imlib.c
index 6cb3166..1b17b49 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -169,11 +169,11 @@ int feh_load_image(Imlib_Image * im, feh_file * file)
file->ed = exif_get_data(tmpname);
#endif
}
- if ((opt.slideshow) && (opt.reload == 0)) {
+ if ((opt.slideshow) && (opt.reload == 0) && (image_source != SRC_MAGICK)) {
free(file->filename);
file->filename = estrdup(tmpname);
- if ((image_source == SRC_MAGICK) || !opt.keep_http)
+ if (!opt.keep_http)
add_file_to_rm_filelist(tmpname);
}
else if ((image_source == SRC_MAGICK) || !opt.keep_http)