diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2012-03-13 00:45:13 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2012-03-13 00:45:13 +0100 |
| commit | 8f5bf736a9d3f8084c644dbf6ceefc4142715c4e (patch) | |
| tree | cc912d82821c91b48f248a0dc6fe69d31e400861 /src/options.c | |
| parent | cbab594f051b5c21a76d0ad389a25d6449e0b839 (diff) | |
Experimental code to limit imagemagick convert runtime (see #82)
Problems so far:
* leaks zombie processes
* does not work when terminating feh with a signal (since the convert process
is no longer in feh's process group)
Diffstat (limited to 'src/options.c')
| -rw-r--r-- | src/options.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/options.c b/src/options.c index f389e0e..a277003 100644 --- a/src/options.c +++ b/src/options.c @@ -53,6 +53,7 @@ void init_parse_options(int argc, char **argv) opt.display = 1; opt.aspect = 1; opt.slideshow_delay = 0.0; + opt.magick_timeout = 10; opt.thumb_w = 60; opt.thumb_h = 60; opt.thumb_redraw = 10; @@ -378,6 +379,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"zoom" , 1, 0, 205}, {"no-screen-clip", 0, 0, 206}, {"index-info" , 1, 0, 207}, + {"magick-timeout", 1, 0, 208}, {"caption-path" , 1, 0, 'K'}, {"action1" , 1, 0, 209}, {"action2" , 1, 0, 210}, @@ -646,6 +648,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case 207: opt.index_info = estrdup(optarg); break; + case 208: + opt.magick_timeout = atoi(optarg); + break; case 'K': opt.caption_path = estrdup(optarg); break; |