summaryrefslogtreecommitdiff
path: root/src/options.c
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-08-28 12:45:57 +0200
committerDennis Real <github@tildepipe.org>2012-08-28 12:45:57 +0200
commit0f6d9518b5a12538e4064ef1c397b62e6be61f3b (patch)
tree1bb349f1f28cb3be9c8c51569aad862f811c259c /src/options.c
parent840474a293c3230383afc9e7822ae94a93379f1c (diff)
parent25d2a1c0e9c76fa9c37a697147cba2f944ffbb62 (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c4
1 files changed, 2 insertions, 2 deletions
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;