summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-02-28 18:37:45 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-02-28 18:37:45 +0100
commitc0a5505187f9727bb9968ee27854400a094805ca (patch)
tree5a513dacf50537e3ee678005ae2212821d0feef3 /src
parente6a535093596d3732628b8114386eb9b72929a02 (diff)
parentd1cffb065667e9d96fb6a03b3fcda5a9543f8d0c (diff)
Merge branch 'fix-no-files-found-on-reload' of https://github.com/Ferada/feh into Ferada-fix-no-files-found-on-reload
Diffstat (limited to 'src')
-rw-r--r--src/slideshow.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/slideshow.c b/src/slideshow.c
index 1615608..effdcaf 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -107,6 +107,10 @@ void cb_reload_timer(void *data)
add_file_to_filelist_recursively(l->data, FILELIST_FIRST);
else if (!opt.filelistfile && !opt.bgmode)
add_file_to_filelist_recursively(".", FILELIST_FIRST);
+
+ if (opt.filelistfile) {
+ filelist = gib_list_cat(filelist, feh_read_filelist(opt.filelistfile));
+ }
if (!(filelist_len = gib_list_length(filelist))) {
eprintf("No files found to reload.");