summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2022-02-10 21:41:35 +0100
committerDaniel Friesel <derf@finalrewind.org>2022-02-10 21:41:35 +0100
commit26cd770c8732a4467e57cf3e7a5d4c2518836275 (patch)
treed16eba0869547a574c293054972e8941c1c96c1c /src
parentfacb67f8438aa8ef18ffacdccfd0a2d1c2730e5c (diff)
Run init_magic before init_parse_options
init_parse_options calls feh_prepare_filelist, which in turn calls feh_file_info_preload if opt.preload is set. This function will load all images in the filelist to determine their attributes, so we need to initialize libmagic before calling init_parse_options.
Diffstat (limited to 'src')
-rw-r--r--src/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 34b667a..85e0504 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,6 +49,11 @@ int main(int argc, char **argv)
srandom(getpid() * time(NULL) % ((unsigned int) -1));
setup_signal_handlers();
+
+#ifdef HAVE_LIBMAGIC
+ init_magic();
+#endif
+
init_parse_options(argc, argv);
init_imlib_fonts();
@@ -69,10 +74,6 @@ int main(int argc, char **argv)
#endif
}
-#ifdef HAVE_LIBMAGIC
- init_magic();
-#endif
-
feh_event_init();
if (opt.index)