# HG changeset patch # User Klaus Ethgen # Date 1516651703 -3600 # Node ID cf6d3d6a6dc22c2adeee0bcb6a347cc58f3a08be # Parent e0251a8eba95918a67d692d086f5b498ab45a003# Parent c96eddf47c7887d1b836b1cd495e6ba476d3bbf4 Merge remote-tracking branch 'github/merge-requests/579' * github/merge-requests/579: Thumbnail all files if filtering is disabled. diff -r e0251a8eba95 -r cf6d3d6a6dc2 src/thumb.c --- a/src/thumb.c Mon Jan 22 21:07:11 2018 +0100 +++ b/src/thumb.c Mon Jan 22 21:08:23 2018 +0100 @@ -337,7 +337,7 @@ 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 -r e0251a8eba95 -r cf6d3d6a6dc2 src/thumb_standard.c --- a/src/thumb_standard.c Mon Jan 22 21:07:11 2018 +0100 +++ b/src/thumb_standard.c Mon Jan 22 21:08:23 2018 +0100 @@ -668,7 +668,7 @@ 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;