Mercurial > hg > forks > geeqie
changeset 2716:cf6d3d6a6dc2
Merge remote-tracking branch 'github/merge-requests/579'
* github/merge-requests/579:
Thumbnail all files if filtering is disabled.
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Mon, 22 Jan 2018 21:08:23 +0100 |
| parents | e0251a8eba95 (current diff) c96eddf47c78 (diff) |
| children | 4903104ff447 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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;