Module Name: src
Committed By: martin
Date: Tue Dec 30 10:10:22 UTC 2014
Modified Files:
src/usr.sbin/sysinst: run.c
Log Message:
Revise previous: with RUN_SILENT there is never a good reason to create
the output window unless there is actually output to display.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/run.c
diff -u src/usr.sbin/sysinst/run.c:1.4 src/usr.sbin/sysinst/run.c:1.5
--- src/usr.sbin/sysinst/run.c:1.4 Mon Dec 29 14:43:06 2014
+++ src/usr.sbin/sysinst/run.c Tue Dec 30 10:10:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.4 2014/12/29 14:43:06 martin Exp $ */
+/* $NetBSD: run.c,v 1.5 2014/12/30 10:10:22 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -500,7 +500,7 @@ launch_subwin(WINDOW **actionwin, char *
tmo.tv_sec = flags & RUN_SILENT ? 20 : 2;
tmo.tv_usec = 0;
i = select(FD_SETSIZE, &read_fd_set, NULL, NULL, &tmo);
- if (i == 0 && *actionwin == NULL)
+ if (i == 0 && *actionwin == NULL && (flags & RUN_SILENT) == 0)
*actionwin = show_cmd(scmd, win);
if (i < 0) {
if (errno != EINTR) {
