summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/imlib.c1
-rw-r--r--src/options.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/src/imlib.c b/src/imlib.c
index 1786876..6d48394 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -545,6 +545,7 @@ static char *feh_magick_load_image(char *filename)
#ifdef HAVE_LIBCURL
+// TODO use cache for dcraw and magick conversion results as well
gib_hash* http_cache = NULL;
#if LIBCURL_VERSION_NUM >= 0x072000 /* 07.32.0 */
diff --git a/src/options.c b/src/options.c
index 98b3eed..eb0fbe5 100644
--- a/src/options.c
+++ b/src/options.c
@@ -76,6 +76,7 @@ void init_parse_options(int argc, char **argv)
#ifdef HAVE_INOTIFY
opt.auto_reload = 1;
#endif /* HAVE_INOTIFY */
+ opt.use_http_cache = 1;
feh_getopt_theme(argc, argv);
@@ -431,7 +432,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{"auto-reload" , 0, 0, 248},
#endif
{"class" , 1, 0, 249},
- {"use-http-cache", 0, 0, 250},
+ {"no-conversion-cache", 0, 0, 250},
{0, 0, 0, 0}
};
int optch = 0, cmdx = 0;
@@ -524,6 +525,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
break;
case 'R':
opt.reload = atof(optarg);
+ opt.use_http_cache = 0;
#ifdef HAVE_INOTIFY
opt.auto_reload = 0;
#endif
@@ -829,7 +831,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
opt.x11_class = estrdup(optarg);
break;
case 250:
- opt.use_http_cache = 1;
+ opt.use_http_cache = 0;
break;
default:
break;