summaryrefslogtreecommitdiff
path: root/src/options.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-08-05 10:22:33 +0200
committerDaniel Friesel <derf@finalrewind.org>2018-08-05 10:22:33 +0200
commit3b524947ce86e0120e5401e12b6bfa6a4ff3a918 (patch)
tree25520b5997535e3d78aa192a834452cf26d2063c /src/options.c
parent1538aafffa9a99d7d4fd760cae02876066a0ad82 (diff)
parentbe40f4f127133e098d3bff8de849ab7da400ab4f (diff)
Merge branch 'ulteq-dcraw'
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/options.c b/src/options.c
index ab9006c..b0d67cd 100644
--- a/src/options.c
+++ b/src/options.c
@@ -55,6 +55,7 @@ void init_parse_options(int argc, char **argv)
opt.display = 1;
opt.aspect = 1;
opt.slideshow_delay = 0.0;
+ opt.dcraw_timeout = -1;
opt.magick_timeout = -1;
opt.thumb_w = 60;
opt.thumb_h = 60;
@@ -415,6 +416,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{"insecure" , 0, 0, 240},
{"no-recursive" , 0, 0, 241},
{"cache-size" , 1, 0, 243},
+ {"dcraw-timeout" , 1, 0, 245},
{"version-sort" , 0, 0, 246},
{"offset" , 1, 0, 247},
{0, 0, 0, 0}
@@ -783,6 +785,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
if (opt.cache_size > 2048)
opt.cache_size = 2048;
break;
+ case 245:
+ opt.dcraw_timeout = atoi(optarg);
+ break;
case 246:
opt.version_sort = 1;
break;