Merge branch 'master' of git://github.com/derf/feh

5 files changed, 9 insertions, 12 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) {
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);
diff --git a/src/keyevents.c b/src/keyevents.c
index 343b5d1..18853ed 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -750,7 +750,7 @@ void feh_event_handle_keypress(XEvent * ev)
 		if (opt.reload < SLIDESHOW_RELOAD_MAX)
 			opt.reload++;
 		else if (opt.verbose)
-			weprintf("Cannot set RELOAD higher than %d seconds.", opt.reload);
+			weprintf("Cannot set RELOAD higher than %f seconds.", opt.reload);
 	}
 	else if (feh_is_kp(&keys.reload_minus, keysym, state)) {
 		if (opt.reload > 1)
diff --git a/src/options.c b/src/options.c
index c27e11e..09ae5cc 100644
--- a/src/options.c
+++ b/src/options.c
@@ -53,7 +53,7 @@ void init_parse_options(int argc, char **argv)
 	opt.display = 1;
 	opt.aspect = 1;
 	opt.slideshow_delay = 0.0;
-	opt.magick_timeout = 5;
+	opt.magick_timeout = -1;
 	opt.thumb_w = 60;
 	opt.thumb_h = 60;
 	opt.thumb_redraw = 10;
@@ -590,7 +590,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 			}
 			break;
 		case 'R':
-			opt.reload = atoi(optarg);
+			opt.reload = atof(optarg);
 			break;
 		case 'a':
 			opt.alpha = 1;
diff --git a/src/options.h b/src/options.h
index cef4215..a763642 100644
--- a/src/options.h
+++ b/src/options.h
@@ -97,7 +97,7 @@ struct __fehoptions {
 	int limit_w;
 	int limit_h;
 	unsigned int thumb_redraw;
-	int reload;
+	double reload;
 	int sort;
 	int debug;
 	int geom_flags;