summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-02-26 14:32:58 +0100
committerDaniel Friesel <derf@finalrewind.org>2016-02-26 14:32:58 +0100
commite5adeaf9366105cf2cf056b94f4067d8d6709da6 (patch)
tree843d5f9b0acf706064d7458f5a1be0c45135ece0 /src
parentfeeb16ec579217d12de5d197545f7367358edbcd (diff)
parent5990b6281b9d0f7dba0046c3d1f6bd6a4d7ce714 (diff)
Merge branch 'guraga-patch-1'
Diffstat (limited to 'src')
-rw-r--r--src/options.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/options.c b/src/options.c
index 0265156..f5f1242 100644
--- a/src/options.c
+++ b/src/options.c
@@ -407,6 +407,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{"scroll-step" , 1, 0, 238},
{"xinerama-index", 1, 0, 239},
{"insecure" , 0, 0, 240},
+ {"no-recursive" , 0, 0, 241},
{0, 0, 0, 0}
};
int optch = 0, cmdx = 0;
@@ -761,6 +762,8 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
break;
case 240:
opt.insecure_ssl = 1;
+ case 241:
+ opt.recursive = 0;
default:
break;
}