Merge remote-tracking branch 'github/merge-requests/579'

* github/merge-requests/579:
  Thumbnail all files if filtering is disabled.

diff --git a/src/thumb.c b/src/thumb.c
index 96b71f8..cdd4e55 100644 (file)
--- a/src/thumb.c
+++ b/src/thumb.c
@@ -337,7 +337,7 @@ gboolean thumb_loader_start(ThumbLoader *tl, FileData *fd)
 
        if (!tl->fd) tl->fd = file_data_ref(fd);
 
-       if (tl->fd->format_class != FORMAT_CLASS_IMAGE && tl->fd->format_class != FORMAT_CLASS_RAWIMAGE && tl->fd->format_class != FORMAT_CLASS_VIDEO)
+       if (tl->fd->format_class != FORMAT_CLASS_IMAGE && tl->fd->format_class != FORMAT_CLASS_RAWIMAGE && tl->fd->format_class != FORMAT_CLASS_VIDEO && !options->file_filter.disable)
                {
                thumb_loader_set_fallback(tl);
                return FALSE;

diff --git a/src/thumb_standard.c b/src/thumb_standard.c
index 9deb594..f068ed0 100644 (file)
--- a/src/thumb_standard.c
+++ b/src/thumb_standard.c
@@ -668,7 +668,7 @@ gboolean thumb_loader_std_start(ThumbLoaderStd *tl, FileData *fd)
 
 
        tl->fd = file_data_ref(fd);
-       if (!stat_utf8(fd->path, &st) || (tl->fd->format_class != FORMAT_CLASS_IMAGE && tl->fd->format_class != FORMAT_CLASS_RAWIMAGE && tl->fd->format_class != FORMAT_CLASS_VIDEO))
+       if (!stat_utf8(fd->path, &st) || (tl->fd->format_class != FORMAT_CLASS_IMAGE && tl->fd->format_class != FORMAT_CLASS_RAWIMAGE && tl->fd->format_class != FORMAT_CLASS_VIDEO && !options->file_filter.disable))
                {
                thumb_loader_std_set_fallback(tl);
                return FALSE;