Mercurial > hg > forks > geeqie

changeset 2715:c96eddf47c78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Thumbnail all files if filtering is disabled. If the user has disabled filtering by file extension, then we should also disable that filtering when generating/loading thumbnails. Fixes regression from 9be75e3431104d6a3a0c80324a8e3ac60316be13.
author Anthony DeRobertis <anthony@derobert.net>
date Sat, 20 Jan 2018 03:09:08 +0100
parents 8ba86a100c53
children cf6d3d6a6dc2
files src/thumb.c src/thumb_standard.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/thumb.c	Mon Jan 01 13:40:30 2018 +0100
+++ b/src/thumb.c	Sat Jan 20 03:09:08 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;
--- a/src/thumb_standard.c	Mon Jan 01 13:40:30 2018 +0100
+++ b/src/thumb_standard.c	Sat Jan 20 03:09:08 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;