summaryrefslogtreecommitdiff
path: root/src/filelist.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-02-14 21:52:04 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-02-14 21:52:04 +0100
commit202e6e6d35654010a308017f1c9c8b3e8000c970 (patch)
tree9eea4cf3a80f34f3bdee54fcd669fcf28d96de04 /src/filelist.c
parent4abbd21f698945a662ed57e2dad6b6b25de9e474 (diff)
parentb9b84ee55d6b255bcf39a4f8ca6195749ef1fc5c (diff)
Merge branch 'dimension-pruning-without-preload' of https://github.com/ulteq/feh into ulteq-dimension-pruning-without-preload
Diffstat (limited to 'src/filelist.c')
-rw-r--r--src/filelist.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/filelist.c b/src/filelist.c
index b569b8a..0066efd 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -464,9 +464,7 @@ int feh_cmp_format(void *file1, void *file2)
void feh_prepare_filelist(void)
{
- if (opt.list || opt.customlist || (opt.sort > SORT_MTIME)
- || opt.preload || opt.min_width || opt.min_height
- || (opt.max_width != UINT_MAX) || (opt.max_height != UINT_MAX)) {
+ if (opt.list || opt.preload || opt.customlist || (opt.sort > SORT_MTIME)) {
/* For these sort options, we have to preload images */
filelist = feh_file_info_preload(filelist);
if (!gib_list_length(filelist))