Commit 0c5ed692 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Show ImageMagick output on the terminal unless --quiet is specified

(cf #309)
parent 42ef8d98
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -323,11 +323,13 @@ static char *feh_magick_load_image(char *filename)
	}
	else if (childpid == 0) {

		/* discard convert output */
		devnull = open("/dev/null", O_WRONLY);
		dup2(devnull, 0);
		if (opt.quiet) {
			/* discard convert output */
			dup2(devnull, 1);
			dup2(devnull, 2);
		}

		/*
		 * convert only accepts SIGINT via killpg, a normal kill doesn't work