summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2020-03-29 07:47:42 +0200
committerDaniel Friesel <derf@finalrewind.org>2020-03-29 07:47:42 +0200
commitb6f554762a4a50e77cb89f778838227dc5351e5d (patch)
tree78563874291f199a6865563e73382966b9aae41d
parentf13a473e50bf662aa5760ce37e1106b903ef13f7 (diff)
parent31a2b5709080b49941319d3613485cc465bffebe (diff)
Merge branch 'iglosiggio-start-at-supports-urls'
-rw-r--r--share/applications/feh.pre2
-rw-r--r--src/options.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/share/applications/feh.pre b/share/applications/feh.pre
index 9b617e0..fe23468 100644
--- a/share/applications/feh.pre
+++ b/share/applications/feh.pre
@@ -4,7 +4,7 @@ Name[en_US]=feh
GenericName=Image viewer
GenericName[en_US]=Image viewer
Comment=Image viewer and cataloguer
-Exec=feh --start-at %f
+Exec=feh --start-at %u
Terminal=false
Type=Application
Icon=feh
diff --git a/src/options.c b/src/options.c
index d3c1d52..aae10c2 100644
--- a/src/options.c
+++ b/src/options.c
@@ -843,7 +843,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
}
}
else if (finalrun && !opt.filelistfile && !opt.bgmode) {
- if (opt.start_list_at && !path_is_url(opt.start_list_at) && strrchr(opt.start_list_at, '/')) {
+ if (opt.start_list_at && path_is_url(opt.start_list_at)) {
+ add_file_to_filelist_recursively(opt.start_list_at, FILELIST_FIRST);
+ } else if (opt.start_list_at && strrchr(opt.start_list_at, '/')) {
char *target_directory = estrdup(opt.start_list_at);
char *filename_start = strrchr(target_directory, '/');
if (filename_start) {