Fix bug 3006812: ensure exif cache is initialized even when all files are unreadable.

[geeqie.git] / src / exif-common.c

diff --git a/src/exif-common.c b/src/exif-common.c
index 49b31f2..f87d141 100644 (file)
--- a/src/exif-common.c
+++ b/src/exif-common.c
@@ -636,14 +636,20 @@ void exif_release_cb(FileData *fd)
        fd->exif = NULL;
 }
 
+void exif_init_cache(void)
+{
+       assert(!exif_cache);
+       exif_cache = file_cache_new(exif_release_cb, 4);
+}
+
 ExifData *exif_read_fd(FileData *fd)
 {
        gchar *sidecar_path;
+       
+       if (!exif_cache) exif_init_cache();
 
        if (!fd || !is_readable_file(fd->path)) return NULL;
        
-       if (!exif_cache) exif_cache = file_cache_new(exif_release_cb, 4);
-       
        if (file_cache_get(exif_cache, fd)) return fd->exif;
        
        /* CACHE_TYPE_XMP_METADATA file should exist only if the metadata are