summaryrefslogtreecommitdiff
path: root/src/options.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/options.c b/src/options.c
index b0d67cd..af0f07d 100644
--- a/src/options.c
+++ b/src/options.c
@@ -55,8 +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.conversion_timeout = -1;
opt.thumb_w = 60;
opt.thumb_h = 60;
opt.thumb_redraw = 10;
@@ -416,7 +415,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},
+ {"conversion-timeout" , 1, 0, 245},
{"version-sort" , 0, 0, 246},
{"offset" , 1, 0, 247},
{0, 0, 0, 0}
@@ -695,7 +694,8 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
opt.index_info = estrdup(optarg);
break;
case 208:
- opt.magick_timeout = atoi(optarg);
+ weprintf("--magick-timeout is deprecated, please use --conversion-timeout instead");
+ opt.conversion_timeout = atoi(optarg);
break;
case 209:
opt.actions[1] = estrdup(optarg);
@@ -786,7 +786,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
opt.cache_size = 2048;
break;
case 245:
- opt.dcraw_timeout = atoi(optarg);
+ opt.conversion_timeout = atoi(optarg);
break;
case 246:
opt.version_sort = 1;