summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-03-15 21:07:50 +0100
committerDaniel Friesel <derf@finalrewind.org>2012-03-15 21:07:50 +0100
commit338553950063615b59d80d2148d208b490c3d0bd (patch)
tree3849a41dd1fe0a39ec98bba117358f6e36d43d54
parent489b73d5f479dce3c70bab50b8663bdf1527b2cf (diff)
feh_magick_load_image: close stdin as well
-rw-r--r--src/imlib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imlib.c b/src/imlib.c
index 090159c..eda3e2a 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -286,14 +286,14 @@ static char *feh_magick_load_image(char *filename)
/* discard convert output */
devnull = open("/dev/null", O_WRONLY);
+ dup2(devnull, 0);
dup2(devnull, 1);
dup2(devnull, 2);
/*
* convert only accepts SIGINT via killpg, a normal kill doesn't work
*/
- if (opt.magick_timeout)
- setpgid(0, 0);
+ setpgid(0, 0);
execlp("convert", "convert", filename, argv_fd, NULL);
exit(1);